Change #include filenames from <foo.h> to <openssl.h>.

[openssl.git] / crypto / evp / e_cbc_r5.c

diff --git a/crypto/evp/e_cbc_r5.c b/crypto/evp/e_cbc_r5.c
index f7d46ca91f9da14f5bf214be82b24f0a29a96d41..b9418b551e894dd510e3300319ec7e6a05e6421c 100644 (file)
--- a/crypto/evp/e_cbc_r5.c
+++ b/crypto/evp/e_cbc_r5.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
 
 #include <stdio.h>
 #include "cryptlib.h"

-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>

 
 #ifndef NOPROTO
 static void r_32_12_16_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 
 #ifndef NOPROTO
 static void r_32_12_16_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,


@@ -86,16 +86,13 @@ static EVP_CIPHER rc5_32_12_16_cbc_cipher=
        NULL,
        };
 
        NULL,
        };
 

-EVP_CIPHER *EVP_rc5_32_12_16_cbc()
+EVP_CIPHER *EVP_rc5_32_12_16_cbc(void)

        {
        return(&rc5_32_12_16_cbc_cipher);
        }
        
        {
        return(&rc5_32_12_16_cbc_cipher);
        }
        

-static void r_32_12_16_cbc_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void r_32_12_16_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)

        {
        if (iv != NULL)
                memcpy(&(ctx->oiv[0]),iv,8);
        {
        if (iv != NULL)
                memcpy(&(ctx->oiv[0]),iv,8);


@@ -105,11 +102,8 @@ int enc;
                        key,RC5_12_ROUNDS);
        }
 
                        key,RC5_12_ROUNDS);
        }
 

-static void r_32_12_16_cbc_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void r_32_12_16_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)

        {
        RC5_32_cbc_encrypt(
                in,out,(long)inl,
        {
        RC5_32_cbc_encrypt(
                in,out,(long)inl,