Add new function, EVP_MD_CTX_copy() to replace frequent use of memcpy.
authorMark J. Cox <mark@openssl.org>
Sun, 31 Jan 1999 12:14:39 +0000 (12:14 +0000)
committerMark J. Cox <mark@openssl.org>
Sun, 31 Jan 1999 12:14:39 +0000 (12:14 +0000)
Submitted by: Eric A Young - from changes to C2Net SSLeay
Reviewed by: Mark Cox
PR:

CHANGES
crypto/evp/digest.c
crypto/evp/evp.err
crypto/evp/evp.h
crypto/evp/evp_err.c
crypto/evp/p_sign.c
crypto/evp/p_verify.c

diff --git a/CHANGES b/CHANGES
index 4cd84cc..9c33fbe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Add new function, EVP_MD_CTX_copy() to replace frequent use of memcpy.
+     [Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
+
   *) Make sure `make rehash' target really finds the `openssl' program.
      [Ralf S. Engelschall, Matthias Loepfe <Matthias.Loepfe@adnovum.ch>]
 
index d65f003..7ef0e73 100644 (file)
@@ -87,3 +87,13 @@ unsigned int *size;
                *size=ctx->digest->md_size;
        memset(&(ctx->md),0,sizeof(ctx->md));
        }
+
+int EVP_MD_CTX_copy(EVP_MD_CTX *out, EVP_MD_CTX *in)
+{
+    if ((in == NULL) || (in->digest == NULL)) {
+        EVPerr(EVP_F_EVP_MD_CTX_COPY,EVP_R_INPUT_NOT_INITALISED);
+       return 0;
+    }
+    memcpy((char *)out,(char *)in,in->digest->ctx_size);
+    return 1;
+}    
index b6ed829..c2470f6 100644 (file)
@@ -11,6 +11,7 @@
 #define EVP_F_EVP_SIGNFINAL                             107
 #define EVP_F_EVP_VERIFYFINAL                           108
 #define EVP_F_RC2_MAGIC_TO_METH                                 109
+#define EVP_F_EVP_MD_CTX_COPY                            110
 
 /* Reason codes. */
 #define EVP_R_BAD_DECRYPT                               100
@@ -24,3 +25,4 @@
 #define EVP_R_UNSUPPORTED_KEY_SIZE                      108
 #define EVP_R_WRONG_FINAL_BLOCK_LENGTH                  109
 #define EVP_R_WRONG_PUBLIC_KEY_TYPE                     110
+#define EVP_R_INPUT_NOT_INITALISED                       111
index e6296ce..c780543 100644 (file)
@@ -460,6 +460,7 @@ typedef struct evp_Encode_Ctx_st
 
 #ifndef NOPROTO
 
+int     EVP_MD_CTX_copy(EVP_MD_CTX *out,EVP_MD_CTX *in);  
 void   EVP_DigestInit(EVP_MD_CTX *ctx, EVP_MD *type);
 void   EVP_DigestUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt);
 void   EVP_DigestFinal(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s);
@@ -626,6 +627,7 @@ int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c,ASN1_TYPE *type);
 
 #else
 
+int     EVP_MD_CTX_copy(); 
 void   EVP_DigestInit();
 void   EVP_DigestUpdate();
 void   EVP_DigestFinal();
@@ -782,6 +784,7 @@ int EVP_CIPHER_get_asn1_iv();
 #define EVP_F_EVP_SIGNFINAL                             107
 #define EVP_F_EVP_VERIFYFINAL                           108
 #define EVP_F_RC2_MAGIC_TO_METH                                 109
+#define EVP_F_EVP_MD_CTX_COPY                            110
 
 /* Reason codes. */
 #define EVP_R_BAD_DECRYPT                               100
@@ -795,6 +798,7 @@ int EVP_CIPHER_get_asn1_iv();
 #define EVP_R_UNSUPPORTED_KEY_SIZE                      108
 #define EVP_R_WRONG_FINAL_BLOCK_LENGTH                  109
 #define EVP_R_WRONG_PUBLIC_KEY_TYPE                     110
+#define EVP_R_INPUT_NOT_INITALISED                       111
  
 #ifdef  __cplusplus
 }
index c7caa3b..19b3a18 100644 (file)
@@ -73,6 +73,7 @@ static ERR_STRING_DATA EVP_str_functs[]=
 {ERR_PACK(0,EVP_F_EVP_SIGNFINAL,0),    "EVP_SignFinal"},
 {ERR_PACK(0,EVP_F_EVP_VERIFYFINAL,0),  "EVP_VerifyFinal"},
 {ERR_PACK(0,EVP_F_RC2_MAGIC_TO_METH,0),        "RC2_MAGIC_TO_METH"},
+{ERR_PACK(0,EVP_F_EVP_MD_CTX_COPY,0),  "EVP_MD_CTX_copy"},
 {0,NULL},
        };
 
@@ -89,6 +90,7 @@ static ERR_STRING_DATA EVP_str_reasons[]=
 {EVP_R_UNSUPPORTED_KEY_SIZE              ,"unsupported key size"},
 {EVP_R_WRONG_FINAL_BLOCK_LENGTH          ,"wrong final block length"},
 {EVP_R_WRONG_PUBLIC_KEY_TYPE             ,"wrong public key type"},
+{EVP_R_INPUT_NOT_INITALISED              ,"input not initalised"},
 {0,NULL},
        };
 
index 073270c..4b34206 100644 (file)
@@ -91,7 +91,7 @@ EVP_PKEY *pkey;
        MS_STATIC EVP_MD_CTX tmp_ctx;
 
        *siglen=0;
-       memcpy(&tmp_ctx,ctx,sizeof(EVP_MD_CTX));
+       EVP_MD_CTX_copy(&tmp_ctx,ctx);   
        EVP_DigestFinal(&tmp_ctx,&(m[0]),&m_len);
        for (i=0; i<4; i++)
                {
index 8d727d8..0a9bb05 100644 (file)
@@ -88,7 +88,7 @@ EVP_PKEY *pkey;
                EVPerr(EVP_F_EVP_VERIFYFINAL,EVP_R_WRONG_PUBLIC_KEY_TYPE);
                return(-1);
                }
-       memcpy(&tmp_ctx,ctx,sizeof(EVP_MD_CTX));
+       EVP_MD_CTX_copy(&tmp_ctx,ctx);     
        EVP_DigestFinal(&tmp_ctx,&(m[0]),&m_len);
         if (ctx->digest->verify == NULL)
                 {