resolve conflicts

1 files changed, 118 insertions, 7 deletions

diff --git a/src/lib/libcrypto/evp/evp_lib.c b/src/lib/libcrypto/evp/evp_lib.c
index a63ba19317..edb28ef38e 100644
--- a/src/lib/libcrypto/evp/evp_lib.c
+++ b/src/lib/libcrypto/evp/evp_lib.c
@@ -68,7 +68,7 @@ int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
         if (c->cipher->set_asn1_parameters != NULL)
                 ret=c->cipher->set_asn1_parameters(c,type);
         else
-                return -1;
+                ret=-1;
         return(ret);
         }
 
@@ -79,20 +79,21 @@ int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
         if (c->cipher->get_asn1_parameters != NULL)
                 ret=c->cipher->get_asn1_parameters(c,type);
         else
-                return -1;
+                ret=-1;
         return(ret);
         }
 
 int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
         {
-        int i=0,l;
+        int i=0;
+        unsigned int l;
 
         if (type != NULL) 
                 {
                 l=EVP_CIPHER_CTX_iv_length(c);
-                OPENSSL_assert(l <= sizeof c->iv);
+                OPENSSL_assert(l <= sizeof(c->iv));
                 i=ASN1_TYPE_get_octetstring(type,c->oiv,l);
-                if (i != l)
+                if (i != (int)l)
                         return(-1);
                 else if (i > 0)
                         memcpy(c->iv,c->oiv,l);
@@ -102,12 +103,13 @@ int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
 
 int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
         {
-        int i=0,j;
+        int i=0;
+        unsigned int j;
 
         if (type != NULL)
                 {
                 j=EVP_CIPHER_CTX_iv_length(c);
-                OPENSSL_assert(j <= sizeof c->iv);
+                OPENSSL_assert(j <= sizeof(c->iv));
                 i=ASN1_TYPE_set_octetstring(type,c->oiv,j);
                 }
         return(i);
@@ -166,3 +168,112 @@ int EVP_CIPHER_type(const EVP_CIPHER *ctx)
         }
 }
 
+int EVP_CIPHER_block_size(const EVP_CIPHER *e)
+        {
+        return e->block_size;
+        }
+
+int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx)
+        {
+        return ctx->cipher->block_size;
+        }
+
+int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl)
+        {
+        return ctx->cipher->do_cipher(ctx,out,in,inl);
+        }
+
+const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx)
+        {
+        return ctx->cipher;
+        }
+
+unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher)
+        {
+        return cipher->flags;
+        }
+
+unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx)
+        {
+        return ctx->cipher->flags;
+        }
+
+void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx)
+        {
+        return ctx->app_data;
+        }
+
+void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data)
+        {
+        ctx->app_data = data;
+        }
+
+int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher)
+        {
+        return cipher->iv_len;
+        }
+
+int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx)
+        {
+        return ctx->cipher->iv_len;
+        }
+
+int EVP_CIPHER_key_length(const EVP_CIPHER *cipher)
+        {
+        return cipher->key_len;
+        }
+
+int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
+        {
+        return ctx->key_len;
+        }
+
+int EVP_CIPHER_nid(const EVP_CIPHER *cipher)
+        {
+        return cipher->nid;
+        }
+
+int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx)
+        {
+        return ctx->cipher->nid;
+        }
+
+int EVP_MD_block_size(const EVP_MD *md) 
+        {
+        return md->block_size;
+        }
+
+int EVP_MD_type(const EVP_MD *md)
+        {
+        return md->type;
+        }
+
+int EVP_MD_pkey_type(const EVP_MD *md)
+        {
+        return md->pkey_type;
+        }
+
+int EVP_MD_size(const EVP_MD *md)
+        {
+        return md->md_size;
+        }
+
+const EVP_MD * EVP_MD_CTX_md(const EVP_MD_CTX *ctx)
+        {
+        return ctx->digest;
+        }
+
+void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags)
+        {
+        ctx->flags |= flags;
+        }
+
+void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags)
+        {
+        ctx->flags &= ~flags;
+        }
+
+int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags)
+        {
+        return (ctx->flags & flags);
+        }