Cleanup: fix all sources that used EVP_MD_CTX_(create|init|destroy)

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/apps/passwd.c b/apps/passwd.c
index 70ecb874ef4137b1c4b6b1286a01b169d8f2d2fa..2a32111e9d92adec3c73b1ecff57ec8a21fd6da6 100644 (file)
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -322,7 +322,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
     salt_len = strlen(salt_out);
     assert(salt_len <= 8);
 
     salt_len = strlen(salt_out);
     assert(salt_len <= 8);
 

-    md = EVP_MD_CTX_create();
+    md = EVP_MD_CTX_new();

     if (md == NULL)
         return NULL;
     EVP_DigestInit_ex(md, EVP_md5(), NULL);
     if (md == NULL)
         return NULL;
     EVP_DigestInit_ex(md, EVP_md5(), NULL);


@@ -332,7 +332,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
     EVP_DigestUpdate(md, "$", 1);
     EVP_DigestUpdate(md, salt_out, salt_len);
 
     EVP_DigestUpdate(md, "$", 1);
     EVP_DigestUpdate(md, salt_out, salt_len);
 

-    md2 = EVP_MD_CTX_create();
+    md2 = EVP_MD_CTX_new();

     if (md2 == NULL)
         return NULL;
     EVP_DigestInit_ex(md2, EVP_md5(), NULL);
     if (md2 == NULL)
         return NULL;
     EVP_DigestInit_ex(md2, EVP_md5(), NULL);


@@ -364,8 +364,8 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
                          (i & 1) ? sizeof buf : passwd_len);
         EVP_DigestFinal_ex(md2, buf, NULL);
     }
                          (i & 1) ? sizeof buf : passwd_len);
         EVP_DigestFinal_ex(md2, buf, NULL);
     }

-    EVP_MD_CTX_destroy(md2);
-    EVP_MD_CTX_destroy(md);
+    EVP_MD_CTX_free(md2);
+    EVP_MD_CTX_free(md);

 
     {
         /* transform buf into output string */
 
     {
         /* transform buf into output string */

diff --git a/apps/req.c b/apps/req.c
index 267a0a025adede10c50e6bffd89f0eccff5a6f9e..c275763932b56b86822b6a842e404c2b463103da 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -1511,7 +1511,7 @@ int do_X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
                  STACK_OF(OPENSSL_STRING) *sigopts)
 {
     int rv;
                  STACK_OF(OPENSSL_STRING) *sigopts)
 {
     int rv;

-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();

 
     rv = do_sign_init(mctx, pkey, md, sigopts);
     /* Note: X509_sign_ctx() calls ASN1_item_sign_ctx(), which destroys
 
     rv = do_sign_init(mctx, pkey, md, sigopts);
     /* Note: X509_sign_ctx() calls ASN1_item_sign_ctx(), which destroys


@@ -1520,7 +1520,7 @@ int do_X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
     if (rv > 0)
         rv = X509_sign_ctx(x, mctx);
     else
     if (rv > 0)
         rv = X509_sign_ctx(x, mctx);
     else

-        EVP_MD_CTX_destroy(mctx);
+        EVP_MD_CTX_free(mctx);

     return rv > 0 ? 1 : 0;
 }
 
     return rv > 0 ? 1 : 0;
 }
 


@@ -1528,7 +1528,7 @@ int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
                      STACK_OF(OPENSSL_STRING) *sigopts)
 {
     int rv;
                      STACK_OF(OPENSSL_STRING) *sigopts)
 {
     int rv;

-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();

     rv = do_sign_init(mctx, pkey, md, sigopts);
     /* Note: X509_REQ_sign_ctx() calls ASN1_item_sign_ctx(), which destroys
      * the EVP_MD_CTX we send it, so only destroy it here if the former
     rv = do_sign_init(mctx, pkey, md, sigopts);
     /* Note: X509_REQ_sign_ctx() calls ASN1_item_sign_ctx(), which destroys
      * the EVP_MD_CTX we send it, so only destroy it here if the former


@@ -1536,7 +1536,7 @@ int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
     if (rv > 0)
         rv = X509_REQ_sign_ctx(x, mctx);
     else
     if (rv > 0)
         rv = X509_REQ_sign_ctx(x, mctx);
     else

-        EVP_MD_CTX_destroy(mctx);
+        EVP_MD_CTX_free(mctx);

     return rv > 0 ? 1 : 0;
 }
 
     return rv > 0 ? 1 : 0;
 }
 


@@ -1544,7 +1544,7 @@ int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
                      STACK_OF(OPENSSL_STRING) *sigopts)
 {
     int rv;
                      STACK_OF(OPENSSL_STRING) *sigopts)
 {
     int rv;

-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();

     rv = do_sign_init(mctx, pkey, md, sigopts);
     /* Note: X509_CRL_sign_ctx() calls ASN1_item_sign_ctx(), which destroys
      * the EVP_MD_CTX we send it, so only destroy it here if the former
     rv = do_sign_init(mctx, pkey, md, sigopts);
     /* Note: X509_CRL_sign_ctx() calls ASN1_item_sign_ctx(), which destroys
      * the EVP_MD_CTX we send it, so only destroy it here if the former


@@ -1552,6 +1552,6 @@ int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
     if (rv > 0)
         rv = X509_CRL_sign_ctx(x, mctx);
     else
     if (rv > 0)
         rv = X509_CRL_sign_ctx(x, mctx);
     else

-        EVP_MD_CTX_destroy(mctx);
+        EVP_MD_CTX_free(mctx);

     return rv > 0 ? 1 : 0;
 }
     return rv > 0 ? 1 : 0;
 }

diff --git a/apps/ts.c b/apps/ts.c
index 4da61d422cb2aa903770c1cfff20d8aa58cbf7d3..00b5e53f7c7a00503936847a5f7c9e1001d32100 100644 (file)
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -523,7 +523,7 @@ static int create_digest(BIO *input, char *digest, const EVP_MD *md,
         return 0;
 
     if (input) {
         return 0;
 
     if (input) {

-        EVP_MD_CTX *md_ctx = EVP_MD_CTX_create();
+        EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();

         unsigned char buffer[4096];
         int length;
 
         unsigned char buffer[4096];
         int length;
 


@@ -535,10 +535,10 @@ static int create_digest(BIO *input, char *digest, const EVP_MD *md,
             EVP_DigestUpdate(md_ctx, buffer, length);
         }
         if (!EVP_DigestFinal(md_ctx, *md_value, NULL)) {
             EVP_DigestUpdate(md_ctx, buffer, length);
         }
         if (!EVP_DigestFinal(md_ctx, *md_value, NULL)) {

-            EVP_MD_CTX_destroy(md_ctx);
+            EVP_MD_CTX_free(md_ctx);

             return 0;
         }
             return 0;
         }

-        EVP_MD_CTX_destroy(md_ctx);
+        EVP_MD_CTX_free(md_ctx);

     } else {
         long digest_len;
         *md_value = string_to_hex(digest, &digest_len);
     } else {
         long digest_len;
         *md_value = string_to_hex(digest, &digest_len);

diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c
index ee9f66c396373cbc8b9745909ac3106111513ada..5b5d5b7afc7f715166c5bbdcab70341ce0e102da 100644 (file)
--- a/crypto/asn1/a_sign.c
+++ b/crypto/asn1/a_sign.c
@@ -132,7 +132,7 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
               ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey,
               const EVP_MD *type)
 {
               ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey,
               const EVP_MD *type)
 {

-    EVP_MD_CTX *ctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *ctx = EVP_MD_CTX_new();

     unsigned char *p, *buf_in = NULL, *buf_out = NULL;
     int i, inl = 0, outl = 0, outll = 0;
     X509_ALGOR *a;
     unsigned char *p, *buf_in = NULL, *buf_out = NULL;
     int i, inl = 0, outl = 0, outll = 0;
     X509_ALGOR *a;


@@ -205,7 +205,7 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
     signature->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT | 0x07);
     signature->flags |= ASN1_STRING_FLAG_BITS_LEFT;
  err:
     signature->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT | 0x07);
     signature->flags |= ASN1_STRING_FLAG_BITS_LEFT;
  err:

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

     OPENSSL_clear_free((char *)buf_in, (unsigned int)inl);
     OPENSSL_clear_free((char *)buf_out, outll);
     return (outl);
     OPENSSL_clear_free((char *)buf_in, (unsigned int)inl);
     OPENSSL_clear_free((char *)buf_out, outll);
     return (outl);


@@ -217,14 +217,14 @@ int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1,
                    X509_ALGOR *algor2, ASN1_BIT_STRING *signature, void *asn,
                    EVP_PKEY *pkey, const EVP_MD *type)
 {
                    X509_ALGOR *algor2, ASN1_BIT_STRING *signature, void *asn,
                    EVP_PKEY *pkey, const EVP_MD *type)
 {

-    EVP_MD_CTX *ctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *ctx = EVP_MD_CTX_new();

 
     if (ctx == NULL) {
         ASN1err(ASN1_F_ASN1_ITEM_SIGN, ERR_R_MALLOC_FAILURE);
         return 0;
     }
     if (!EVP_DigestSignInit(ctx, NULL, type, NULL, pkey)) {
 
     if (ctx == NULL) {
         ASN1err(ASN1_F_ASN1_ITEM_SIGN, ERR_R_MALLOC_FAILURE);
         return 0;
     }
     if (!EVP_DigestSignInit(ctx, NULL, type, NULL, pkey)) {

-        EVP_MD_CTX_destroy(ctx);
+        EVP_MD_CTX_free(ctx);

         return 0;
     }
     return ASN1_item_sign_ctx(it, algor1, algor2, signature, asn, ctx);
         return 0;
     }
     return ASN1_item_sign_ctx(it, algor1, algor2, signature, asn, ctx);


@@ -315,7 +315,7 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it,
     signature->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT | 0x07);
     signature->flags |= ASN1_STRING_FLAG_BITS_LEFT;
  err:
     signature->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT | 0x07);
     signature->flags |= ASN1_STRING_FLAG_BITS_LEFT;
  err:

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

     OPENSSL_clear_free((char *)buf_in, (unsigned int)inl);
     OPENSSL_clear_free((char *)buf_out, outll);
     return (outl);
     OPENSSL_clear_free((char *)buf_in, (unsigned int)inl);
     OPENSSL_clear_free((char *)buf_out, outll);
     return (outl);

diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c
index e958cdec878ff746d5a0669891d719ef9fd50ca4..4acee3eb842b0bfb3679017fa2ddceeb4ced303c 100644 (file)
--- a/crypto/asn1/a_verify.c
+++ b/crypto/asn1/a_verify.c
@@ -77,7 +77,7 @@
 int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature,
                 char *data, EVP_PKEY *pkey)
 {
 int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature,
                 char *data, EVP_PKEY *pkey)
 {

-    EVP_MD_CTX *ctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *ctx = EVP_MD_CTX_new();

     const EVP_MD *type;
     unsigned char *p, *buf_in = NULL;
     int ret = -1, i, inl;
     const EVP_MD *type;
     unsigned char *p, *buf_in = NULL;
     int ret = -1, i, inl;


@@ -126,7 +126,7 @@ int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature,
     }
     ret = 1;
  err:
     }
     ret = 1;
  err:

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

     return (ret);
 }
 
     return (ret);
 }
 


@@ -151,7 +151,7 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
         return -1;
     }
 
         return -1;
     }
 

-    ctx = EVP_MD_CTX_create();
+    ctx = EVP_MD_CTX_new();

     if (ctx == NULL) {
         ASN1err(ASN1_F_ASN1_ITEM_VERIFY, ERR_R_MALLOC_FAILURE);
         goto err;
     if (ctx == NULL) {
         ASN1err(ASN1_F_ASN1_ITEM_VERIFY, ERR_R_MALLOC_FAILURE);
         goto err;


@@ -225,6 +225,6 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
     }
     ret = 1;
  err:
     }
     ret = 1;
  err:

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

     return (ret);
 }
     return (ret);
 }

diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c
index 7aafc8dab07ca00de7e5bbfa5d3221d295e0a2ee..3b9f7b5c5e593b30052857fa5927d834d8883f8e 100644 (file)
--- a/crypto/cms/cms_asn1.c
+++ b/crypto/cms/cms_asn1.c
@@ -95,7 +95,7 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         CMS_SignerInfo *si = (CMS_SignerInfo *)*pval;
         EVP_PKEY_free(si->pkey);
         X509_free(si->signer);
         CMS_SignerInfo *si = (CMS_SignerInfo *)*pval;
         EVP_PKEY_free(si->pkey);
         X509_free(si->signer);

-        EVP_MD_CTX_destroy(si->mctx);
+        EVP_MD_CTX_free(si->mctx);

     }
     return 1;
 }
     }
     return 1;
 }

diff --git a/crypto/cms/cms_dd.c b/crypto/cms/cms_dd.c
index dcbd5788fa67acb49ae0443047127bb981175a3d..9ac45b53e2f9d7d5011879fc5a1701d0d26e72f4 100644 (file)
--- a/crypto/cms/cms_dd.c
+++ b/crypto/cms/cms_dd.c
@@ -99,7 +99,7 @@ BIO *cms_DigestedData_init_bio(CMS_ContentInfo *cms)
 
 int cms_DigestedData_do_final(CMS_ContentInfo *cms, BIO *chain, int verify)
 {
 
 int cms_DigestedData_do_final(CMS_ContentInfo *cms, BIO *chain, int verify)
 {

-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();

     unsigned char md[EVP_MAX_MD_SIZE];
     unsigned int mdlen;
     int r = 0;
     unsigned char md[EVP_MAX_MD_SIZE];
     unsigned int mdlen;
     int r = 0;


@@ -137,7 +137,7 @@ int cms_DigestedData_do_final(CMS_ContentInfo *cms, BIO *chain, int verify)
     }
 
  err:
     }
 
  err:

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

 
     return r;
 
 
     return r;
 

diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index 1570fb6fe584163763a4a375a7bcdca7a438ac5c..5c39746b3c15ac2cd40b133c38cf372c2eed8cf9 100644 (file)
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -287,7 +287,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
 
     si->pkey = pk;
     si->signer = signer;
 
     si->pkey = pk;
     si->signer = signer;

-    si->mctx = EVP_MD_CTX_create();
+    si->mctx = EVP_MD_CTX_new();

     si->pctx = NULL;
 
     if (si->mctx == NULL) {
     si->pctx = NULL;
 
     if (si->mctx == NULL) {


@@ -576,7 +576,7 @@ ASN1_OCTET_STRING *CMS_SignerInfo_get0_signature(CMS_SignerInfo *si)
 static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
                                        CMS_SignerInfo *si, BIO *chain)
 {
 static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
                                        CMS_SignerInfo *si, BIO *chain)
 {

-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();

     int r = 0;
     EVP_PKEY_CTX *pctx = NULL;
 
     int r = 0;
     EVP_PKEY_CTX *pctx = NULL;
 


@@ -654,7 +654,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
     r = 1;
 
  err:
     r = 1;
 
  err:

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     EVP_PKEY_CTX_free(pctx);
     return r;
 
     EVP_PKEY_CTX_free(pctx);
     return r;
 


@@ -696,7 +696,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
     if (si->pctx)
         pctx = si->pctx;
     else {
     if (si->pctx)
         pctx = si->pctx;
     else {

-        EVP_MD_CTX_init(mctx);
+        EVP_MD_CTX_reset(mctx);

         if (EVP_DigestSignInit(mctx, &pctx, md, NULL, si->pkey) <= 0)
             goto err;
     }
         if (EVP_DigestSignInit(mctx, &pctx, md, NULL, si->pkey) <= 0)
             goto err;
     }


@@ -728,7 +728,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
         goto err;
     }
 
         goto err;
     }
 

-    EVP_MD_CTX_init(mctx);
+    EVP_MD_CTX_reset(mctx);

 
     ASN1_STRING_set0(si->signature, abuf, siglen);
 
 
     ASN1_STRING_set0(si->signature, abuf, siglen);
 


@@ -736,7 +736,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
 
  err:
     OPENSSL_free(abuf);
 
  err:
     OPENSSL_free(abuf);

-    EVP_MD_CTX_init(mctx);
+    EVP_MD_CTX_reset(mctx);

     return 0;
 
 }
     return 0;
 
 }


@@ -757,7 +757,7 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
     if (md == NULL)
         return -1;
     if (si->mctx == NULL)
     if (md == NULL)
         return -1;
     if (si->mctx == NULL)

-        si->mctx = EVP_MD_CTX_create();
+        si->mctx = EVP_MD_CTX_new();

     mctx = si->mctx;
     if (EVP_DigestVerifyInit(mctx, &si->pctx, md, NULL, si->pkey) <= 0)
         goto err;
     mctx = si->mctx;
     if (EVP_DigestVerifyInit(mctx, &si->pctx, md, NULL, si->pkey) <= 0)
         goto err;


@@ -780,7 +780,7 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
     if (r <= 0)
         CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, CMS_R_VERIFICATION_FAILURE);
  err:
     if (r <= 0)
         CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, CMS_R_VERIFICATION_FAILURE);
  err:

-    EVP_MD_CTX_init(mctx);
+    EVP_MD_CTX_reset(mctx);

     return r;
 }
 
     return r;
 }
 


@@ -817,7 +817,7 @@ BIO *cms_SignedData_init_bio(CMS_ContentInfo *cms)
 int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
 {
     ASN1_OCTET_STRING *os = NULL;
 int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
 {
     ASN1_OCTET_STRING *os = NULL;

-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();

     EVP_PKEY_CTX *pkctx = NULL;
     int r = -1;
     unsigned char mval[EVP_MAX_MD_SIZE];
     EVP_PKEY_CTX *pkctx = NULL;
     int r = -1;
     unsigned char mval[EVP_MAX_MD_SIZE];


@@ -886,7 +886,7 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
 
  err:
     EVP_PKEY_CTX_free(pkctx);
 
  err:
     EVP_PKEY_CTX_free(pkctx);

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     return r;
 
 }
     return r;
 
 }

diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c
index 35a40bd759449a8d61667e60b49e20272876bf89..8ce849896cea44c8f2d7c33bb870719e57a2457f 100644 (file)
--- a/crypto/dh/dh_kdf.c
+++ b/crypto/dh/dh_kdf.c
@@ -152,7 +152,7 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
     int derlen;
     if (Zlen > DH_KDF_MAX)
         return 0;
     int derlen;
     if (Zlen > DH_KDF_MAX)
         return 0;

-    mctx = EVP_MD_CTX_create();
+    mctx = EVP_MD_CTX_new();

     if (mctx == NULL)
         return 0;
     mdlen = EVP_MD_size(md);
     if (mctx == NULL)
         return 0;
     mdlen = EVP_MD_size(md);


@@ -188,7 +188,7 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
     rv = 1;
  err:
     OPENSSL_free(der);
     rv = 1;
  err:
     OPENSSL_free(der);

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     return rv;
 }
 #endif
     return rv;
 }
 #endif

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index f659d081db26db3329611871c6f09ab9cbba8d67..d6e36149c70e619ed1b30430d5f9d73f9bcacf41 100644 (file)
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -360,7 +360,7 @@ int dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N,
     int counter = 0;
     int r = 0;
     BN_CTX *ctx = NULL;
     int counter = 0;
     int r = 0;
     BN_CTX *ctx = NULL;

-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();

     unsigned int h = 2;
 
     if (mctx == NULL)
     unsigned int h = 2;
 
     if (mctx == NULL)


@@ -640,7 +640,7 @@ int dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N,
         BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     BN_MONT_CTX_free(mont);
         BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     BN_MONT_CTX_free(mont);

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     return ok;
 }
 
     return ok;
 }
 

diff --git a/crypto/ecdh/ech_kdf.c b/crypto/ecdh/ech_kdf.c
index d856b7f5ed26a78437ab35eba8f180edcdfe2e7b..cbcbfd9ea4c19ffea2dbd8abff8cb8bbe127bdfc 100644 (file)
--- a/crypto/ecdh/ech_kdf.c
+++ b/crypto/ecdh/ech_kdf.c
@@ -72,7 +72,7 @@ int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
     if (sinfolen > ECDH_KDF_MAX || outlen > ECDH_KDF_MAX
         || Zlen > ECDH_KDF_MAX)
         return 0;
     if (sinfolen > ECDH_KDF_MAX || outlen > ECDH_KDF_MAX
         || Zlen > ECDH_KDF_MAX)
         return 0;

-    mctx = EVP_MD_CTX_create();
+    mctx = EVP_MD_CTX_new();

     if (mctx == NULL)
         return 0;
     mdlen = EVP_MD_size(md);
     if (mctx == NULL)
         return 0;
     mdlen = EVP_MD_size(md);


@@ -106,6 +106,6 @@ int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
     }
     rv = 1;
  err:
     }
     rv = 1;
  err:

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     return rv;
 }
     return rv;
 }

diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
index 381ca599a74560a724af1b386b44db3d09e54f3f..24c7dc3bea391f0024b3889bd9d2ff321ca4c147 100644 (file)
--- a/crypto/evp/bio_md.c
+++ b/crypto/evp/bio_md.c
@@ -100,7 +100,7 @@ static int md_new(BIO *bi)
 {
     EVP_MD_CTX *ctx;
 
 {
     EVP_MD_CTX *ctx;
 

-    ctx = EVP_MD_CTX_create();
+    ctx = EVP_MD_CTX_new();

     if (ctx == NULL)
         return (0);
 
     if (ctx == NULL)
         return (0);
 


@@ -114,7 +114,7 @@ static int md_free(BIO *a)
 {
     if (a == NULL)
         return (0);
 {
     if (a == NULL)
         return (0);

-    EVP_MD_CTX_destroy(a->ptr);
+    EVP_MD_CTX_free(a->ptr);

     a->ptr = NULL;
     a->init = 0;
     a->flags = 0;
     a->ptr = NULL;
     a->init = 0;
     a->flags = 0;

diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index 49105bd83cdd255fd4e3e6dc8b2940e3594f2a2c..5f3f2dea9fe23aab10a4eb150caca0bd75e1bd7d 100644 (file)
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -183,7 +183,7 @@ static int ok_new(BIO *bi)
 
     ctx->cont = 1;
     ctx->sigio = 1;
 
     ctx->cont = 1;
     ctx->sigio = 1;

-    ctx->md = EVP_MD_CTX_create();
+    ctx->md = EVP_MD_CTX_new();

     bi->init = 0;
     bi->ptr = (char *)ctx;
     bi->flags = 0;
     bi->init = 0;
     bi->ptr = (char *)ctx;
     bi->flags = 0;


@@ -194,7 +194,7 @@ static int ok_free(BIO *a)
 {
     if (a == NULL)
         return (0);
 {
     if (a == NULL)
         return (0);

-    EVP_MD_CTX_destroy(((BIO_OK_CTX *)a->ptr)->md);
+    EVP_MD_CTX_free(((BIO_OK_CTX *)a->ptr)->md);

     OPENSSL_clear_free(a->ptr, sizeof(BIO_OK_CTX));
     a->ptr = NULL;
     a->init = 0;
     OPENSSL_clear_free(a->ptr, sizeof(BIO_OK_CTX));
     a->ptr = NULL;
     a->init = 0;

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 0b1af6f3c6c2ff7ba18501554aa2550cd431ae2e..5da0e01039a6da039942db9f1bf8b70753f509f2 100644 (file)
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -345,7 +345,7 @@ int EVP_Digest(const void *data, size_t count,
                unsigned char *md, unsigned int *size, const EVP_MD *type,
                ENGINE *impl)
 {
                unsigned char *md, unsigned int *size, const EVP_MD *type,
                ENGINE *impl)
 {

-    EVP_MD_CTX *ctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *ctx = EVP_MD_CTX_new();

     int ret;
 
     if (ctx == NULL)
     int ret;
 
     if (ctx == NULL)


@@ -354,7 +354,7 @@ int EVP_Digest(const void *data, size_t count,
     ret = EVP_DigestInit_ex(ctx, type, impl)
         && EVP_DigestUpdate(ctx, data, count)
         && EVP_DigestFinal_ex(ctx, md, size);
     ret = EVP_DigestInit_ex(ctx, type, impl)
         && EVP_DigestUpdate(ctx, data, count)
         && EVP_DigestFinal_ex(ctx, md, size);

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

 
     return ret;
 }
 
     return ret;
 }

diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c
index 231c06b86e4204671f202e54b6171e311e7bcce3..65f038138e4793857e0eea442b2f1d343418d118 100644 (file)
--- a/crypto/evp/evp_key.c
+++ b/crypto/evp/evp_key.c
@@ -136,7 +136,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
     if (data == NULL)
         return (nkey);
 
     if (data == NULL)
         return (nkey);
 

-    c = EVP_MD_CTX_create();
+    c = EVP_MD_CTX_new();

     if (c == NULL)
         goto err;
     for (;;) {
     if (c == NULL)
         goto err;
     for (;;) {


@@ -191,7 +191,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
     }
     rv = type->key_len;
  err:
     }
     rv = type->key_len;
  err:

-    EVP_MD_CTX_destroy(c);
+    EVP_MD_CTX_free(c);

     OPENSSL_cleanse(md_buf, sizeof(md_buf));
     return rv;
 }
     OPENSSL_cleanse(md_buf, sizeof(md_buf));
     return rv;
 }

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index b21000f864601898363e219ce42bd52b0b97a310..067d3301441ced006a4a0825f890c0ec562722a2 100644 (file)
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -158,7 +158,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
             else
                 r = EVP_DigestFinal_ex(ctx, md, &mdlen);
         } else {
             else
                 r = EVP_DigestFinal_ex(ctx, md, &mdlen);
         } else {

-            EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_create();
+            EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_new();

             if (tmp_ctx == NULL || !EVP_MD_CTX_copy_ex(tmp_ctx, ctx))
                 return 0;
             if (sctx)
             if (tmp_ctx == NULL || !EVP_MD_CTX_copy_ex(tmp_ctx, ctx))
                 return 0;
             if (sctx)


@@ -166,7 +166,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
                                                   sigret, siglen, tmp_ctx);
             else
                 r = EVP_DigestFinal_ex(tmp_ctx, md, &mdlen);
                                                   sigret, siglen, tmp_ctx);
             else
                 r = EVP_DigestFinal_ex(tmp_ctx, md, &mdlen);

-            EVP_MD_CTX_destroy(tmp_ctx);
+            EVP_MD_CTX_free(tmp_ctx);

         }
         if (sctx || !r)
             return r;
         }
         if (sctx || !r)
             return r;


@@ -203,7 +203,7 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
         } else
             r = EVP_DigestFinal_ex(ctx, md, &mdlen);
     } else {
         } else
             r = EVP_DigestFinal_ex(ctx, md, &mdlen);
     } else {

-        EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_create();
+        EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_new();

         if (tmp_ctx == NULL || !EVP_MD_CTX_copy_ex(tmp_ctx, ctx))
             return -1;
         if (vctx) {
         if (tmp_ctx == NULL || !EVP_MD_CTX_copy_ex(tmp_ctx, ctx))
             return -1;
         if (vctx) {


@@ -211,7 +211,7 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
                                                 sig, siglen, tmp_ctx);
         } else
             r = EVP_DigestFinal_ex(tmp_ctx, md, &mdlen);
                                                 sig, siglen, tmp_ctx);
         } else
             r = EVP_DigestFinal_ex(tmp_ctx, md, &mdlen);

-        EVP_MD_CTX_destroy(tmp_ctx);
+        EVP_MD_CTX_free(tmp_ctx);

     }
     if (vctx || !r)
         return r;
     }
     if (vctx || !r)
         return r;

diff --git a/crypto/evp/p5_crpt.c b/crypto/evp/p5_crpt.c
index 26bf048989ab9554ce2aecb8db1032b58817624c..d27d83f7eeee817e0aaaf16ac34a797248af1f2c 100644 (file)
--- a/crypto/evp/p5_crpt.c
+++ b/crypto/evp/p5_crpt.c
@@ -110,7 +110,7 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
     else if (passlen == -1)
         passlen = strlen(pass);
 
     else if (passlen == -1)
         passlen = strlen(pass);
 

-    ctx = EVP_MD_CTX_create();
+    ctx = EVP_MD_CTX_new();

     if (ctx == NULL) {
         EVPerr(EVP_F_PKCS5_PBE_KEYIVGEN, ERR_R_MALLOC_FAILURE);
         goto err;
     if (ctx == NULL) {
         EVPerr(EVP_F_PKCS5_PBE_KEYIVGEN, ERR_R_MALLOC_FAILURE);
         goto err;


@@ -148,6 +148,6 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
     OPENSSL_cleanse(iv, EVP_MAX_IV_LENGTH);
     rv = 1;
  err:
     OPENSSL_cleanse(iv, EVP_MAX_IV_LENGTH);
     rv = 1;
  err:

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

     return rv;
 }
     return rv;
 }

diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c
index 8ddb89f69eb01d7c7a1154b7c0587000d33a5294..c5e479e8bdc9aada9c3d6ad50da26d6745d7b19a 100644 (file)
--- a/crypto/evp/p_sign.c
+++ b/crypto/evp/p_sign.c
@@ -78,7 +78,7 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
             goto err;
     } else {
         int rv = 0;
             goto err;
     } else {
         int rv = 0;

-        EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_create();
+        EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_new();

         if (tmp_ctx == NULL) {
             EVPerr(EVP_F_EVP_SIGNFINAL, ERR_R_MALLOC_FAILURE);
             return 0;
         if (tmp_ctx == NULL) {
             EVPerr(EVP_F_EVP_SIGNFINAL, ERR_R_MALLOC_FAILURE);
             return 0;


@@ -86,7 +86,7 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
         rv = EVP_MD_CTX_copy_ex(tmp_ctx, ctx);
         if (rv)
             rv = EVP_DigestFinal_ex(tmp_ctx, m, &m_len);
         rv = EVP_MD_CTX_copy_ex(tmp_ctx, ctx);
         if (rv)
             rv = EVP_DigestFinal_ex(tmp_ctx, m, &m_len);

-        EVP_MD_CTX_destroy(tmp_ctx);
+        EVP_MD_CTX_free(tmp_ctx);

         if (!rv)
             return 0;
     }
         if (!rv)
             return 0;
     }

diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c
index c2328f22936506d284d152a73d7462a39bd36a5a..32ec0de12115bebaa72b9817571e428b8e857d4f 100644 (file)
--- a/crypto/evp/p_verify.c
+++ b/crypto/evp/p_verify.c
@@ -76,7 +76,7 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
             goto err;
     } else {
         int rv = 0;
             goto err;
     } else {
         int rv = 0;

-        EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_create();
+        EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_new();

         if (tmp_ctx == NULL) {
             EVPerr(EVP_F_EVP_VERIFYFINAL, ERR_R_MALLOC_FAILURE);
             return 0;
         if (tmp_ctx == NULL) {
             EVPerr(EVP_F_EVP_VERIFYFINAL, ERR_R_MALLOC_FAILURE);
             return 0;


@@ -84,7 +84,7 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
         rv = EVP_MD_CTX_copy_ex(tmp_ctx, ctx);
         if (rv)
             rv = EVP_DigestFinal_ex(tmp_ctx, m, &m_len);
         rv = EVP_MD_CTX_copy_ex(tmp_ctx, ctx);
         if (rv)
             rv = EVP_DigestFinal_ex(tmp_ctx, m, &m_len);

-        EVP_MD_CTX_destroy(tmp_ctx);
+        EVP_MD_CTX_free(tmp_ctx);

         if (!rv)
             return 0;
     }
         if (!rv)
             return 0;
     }

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 6d1aaf845f54d3a690577ed6bad0aeb4c5cc4b76..2fe511938583a92d3b81e1507a8e9556dd889642 100644 (file)
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -182,9 +182,9 @@ HMAC_CTX *HMAC_CTX_new(void)
 
 static void hmac_ctx_cleanup(HMAC_CTX *ctx)
 {
 
 static void hmac_ctx_cleanup(HMAC_CTX *ctx)
 {

-    EVP_MD_CTX_init(ctx->i_ctx);
-    EVP_MD_CTX_init(ctx->o_ctx);
-    EVP_MD_CTX_init(ctx->md_ctx);
+    EVP_MD_CTX_reset(ctx->i_ctx);
+    EVP_MD_CTX_reset(ctx->o_ctx);
+    EVP_MD_CTX_reset(ctx->md_ctx);

     ctx->md = NULL;
     ctx->key_length = 0;
     memset(ctx->key, 0, sizeof(HMAC_MAX_MD_CBLOCK));
     ctx->md = NULL;
     ctx->key_length = 0;
     memset(ctx->key, 0, sizeof(HMAC_MAX_MD_CBLOCK));


@@ -194,9 +194,9 @@ void HMAC_CTX_free(HMAC_CTX *ctx)
 {
     if (ctx != NULL) {
         hmac_ctx_cleanup(ctx);
 {
     if (ctx != NULL) {
         hmac_ctx_cleanup(ctx);

-        EVP_MD_CTX_destroy(ctx->i_ctx);
-        EVP_MD_CTX_destroy(ctx->o_ctx);
-        EVP_MD_CTX_destroy(ctx->md_ctx);
+        EVP_MD_CTX_free(ctx->i_ctx);
+        EVP_MD_CTX_free(ctx->o_ctx);
+        EVP_MD_CTX_free(ctx->md_ctx);

         OPENSSL_free(ctx);
     }
 }
         OPENSSL_free(ctx);
     }
 }


@@ -205,15 +205,15 @@ int HMAC_CTX_init(HMAC_CTX *ctx)
 {
     hmac_ctx_cleanup(ctx);
     if (ctx->i_ctx == NULL)
 {
     hmac_ctx_cleanup(ctx);
     if (ctx->i_ctx == NULL)

-        ctx->i_ctx = EVP_MD_CTX_create();
+        ctx->i_ctx = EVP_MD_CTX_new();

     if (ctx->i_ctx == NULL)
         goto err;
     if (ctx->o_ctx == NULL)
     if (ctx->i_ctx == NULL)
         goto err;
     if (ctx->o_ctx == NULL)

-        ctx->o_ctx = EVP_MD_CTX_create();
+        ctx->o_ctx = EVP_MD_CTX_new();

     if (ctx->o_ctx == NULL)
         goto err;
     if (ctx->md_ctx == NULL)
     if (ctx->o_ctx == NULL)
         goto err;
     if (ctx->md_ctx == NULL)

-        ctx->md_ctx = EVP_MD_CTX_create();
+        ctx->md_ctx = EVP_MD_CTX_new();

     if (ctx->md_ctx == NULL)
         goto err;
     ctx->md = NULL;
     if (ctx->md_ctx == NULL)
         goto err;
     ctx->md = NULL;

diff --git a/crypto/pem/pem_seal.c b/crypto/pem/pem_seal.c
index 5d9c5975fe203b85c3bbd6955e2938165e88e542..d0db77783219ed3a9bf25b49707fcccee8183f73 100644 (file)
--- a/crypto/pem/pem_seal.c
+++ b/crypto/pem/pem_seal.c
@@ -93,7 +93,7 @@ int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type,
 
     EVP_EncodeInit(&ctx->encode);
 
 
     EVP_EncodeInit(&ctx->encode);
 

-    ctx->md = EVP_MD_CTX_create();
+    ctx->md = EVP_MD_CTX_new();

     if (!EVP_SignInit(ctx->md, md_type))
         goto err;
 
     if (!EVP_SignInit(ctx->md, md_type))
         goto err;
 


@@ -178,7 +178,7 @@ int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
 
     ret = 1;
  err:
 
     ret = 1;
  err:

-    EVP_MD_CTX_destroy(ctx->md);
+    EVP_MD_CTX_free(ctx->md);

     EVP_CIPHER_CTX_cleanup(&ctx->cipher);
     OPENSSL_free(s);
     return (ret);
     EVP_CIPHER_CTX_cleanup(&ctx->cipher);
     OPENSSL_free(s);
     return (ret);

diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index f062728932dca5e778cad85bd1c1317bcf9e5481..c95967cae122cf54da54530f57ec986e127ab279 100644 (file)
--- a/crypto/pem/pvkfmt.c
+++ b/crypto/pem/pvkfmt.c
@@ -650,7 +650,7 @@ static int derive_pvk_key(unsigned char *key,
                           const unsigned char *salt, unsigned int saltlen,
                           const unsigned char *pass, int passlen)
 {
                           const unsigned char *salt, unsigned int saltlen,
                           const unsigned char *pass, int passlen)
 {

-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();;
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();;

     int rv = 1;
     if (mctx == NULL
         || !EVP_DigestInit_ex(mctx, EVP_sha1(), NULL)
     int rv = 1;
     if (mctx == NULL
         || !EVP_DigestInit_ex(mctx, EVP_sha1(), NULL)


@@ -659,7 +659,7 @@ static int derive_pvk_key(unsigned char *key,
         || !EVP_DigestFinal_ex(mctx, key, NULL))
         rv = 0;
 
         || !EVP_DigestFinal_ex(mctx, key, NULL))
         rv = 0;
 

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     return rv;
 }
 
     return rv;
 }
 

diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
index a561d16198ad2218e49147e73645deecd7124b12..3efdd4a5c40dbaf30e90dc2bff97d503b22a5d5b 100644 (file)
--- a/crypto/pkcs12/p12_key.c
+++ b/crypto/pkcs12/p12_key.c
@@ -115,7 +115,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
     int tmpn = n;
 #endif
 
     int tmpn = n;
 #endif
 

-    ctx = EVP_MD_CTX_create();
+    ctx = EVP_MD_CTX_new();

     if (ctx == NULL)
         goto err;
 
     if (ctx == NULL)
         goto err;
 


@@ -218,7 +218,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
     OPENSSL_free(I);
     BN_free(Ij);
     BN_free(Bpl1);
     OPENSSL_free(I);
     BN_free(Ij);
     BN_free(Bpl1);

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

     return ret;
 }
 
     return ret;
 }
 

diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index c5ac2fac90693dc59505bdc5f21be3214cce37fa..91864dceae9b70cc04579f47a12558a6820bdf49 100644 (file)
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -707,7 +707,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         return 0;
     }
 
         return 0;
     }
 

-    ctx_tmp = EVP_MD_CTX_create();
+    ctx_tmp = EVP_MD_CTX_new();

     if (ctx_tmp == NULL) {
         PKCS7err(PKCS7_F_PKCS7_DATAFINAL, ERR_R_MALLOC_FAILURE);
         return 0;
     if (ctx_tmp == NULL) {
         PKCS7err(PKCS7_F_PKCS7_DATAFINAL, ERR_R_MALLOC_FAILURE);
         return 0;


@@ -854,7 +854,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
     }
     ret = 1;
  err:
     }
     ret = 1;
  err:

-    EVP_MD_CTX_destroy(ctx_tmp);
+    EVP_MD_CTX_free(ctx_tmp);

     return (ret);
 }
 
     return (ret);
 }
 


@@ -871,7 +871,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
     if (md == NULL)
         return 0;
 
     if (md == NULL)
         return 0;
 

-    mctx = EVP_MD_CTX_create();
+    mctx = EVP_MD_CTX_new();

     if (mctx == NULL) {
         PKCS7err(PKCS7_F_PKCS7_SIGNER_INFO_SIGN, ERR_R_MALLOC_FAILURE);
         goto err;
     if (mctx == NULL) {
         PKCS7err(PKCS7_F_PKCS7_SIGNER_INFO_SIGN, ERR_R_MALLOC_FAILURE);
         goto err;


@@ -908,7 +908,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
         goto err;
     }
 
         goto err;
     }
 

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

 
     ASN1_STRING_set0(si->enc_digest, abuf, siglen);
 
 
     ASN1_STRING_set0(si->enc_digest, abuf, siglen);
 


@@ -916,7 +916,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
 
  err:
     OPENSSL_free(abuf);
 
  err:
     OPENSSL_free(abuf);

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     return 0;
 
 }
     return 0;
 
 }


@@ -989,7 +989,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
     BIO *btmp;
     EVP_PKEY *pkey;
 
     BIO *btmp;
     EVP_PKEY *pkey;
 

-    mdc_tmp = EVP_MD_CTX_create();
+    mdc_tmp = EVP_MD_CTX_new();

     if (mdc_tmp == NULL) {
         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, ERR_R_MALLOC_FAILURE);
         goto err;
     if (mdc_tmp == NULL) {
         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, ERR_R_MALLOC_FAILURE);
         goto err;


@@ -1087,7 +1087,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
     }
     ret = 1;
  err:
     }
     ret = 1;
  err:

-    EVP_MD_CTX_destroy(mdc_tmp);
+    EVP_MD_CTX_free(mdc_tmp);

     return (ret);
 }
 
     return (ret);
 }
 

diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index ec42fc29f07d90043c66741fd44960ba79745511..c2dfce419a8e11993322c90ba071d83e9e582db8 100644 (file)
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -234,7 +234,7 @@ static int rand_add(const void *buf, int num, double add)
      * hash function.
      */
 
      * hash function.
      */
 

-    m = EVP_MD_CTX_create();
+    m = EVP_MD_CTX_new();

     if (m == NULL)
         goto err;
 
     if (m == NULL)
         goto err;
 


@@ -355,7 +355,7 @@ static int rand_add(const void *buf, int num, double add)
 #endif
     rv = 1;
  err:
 #endif
     rv = 1;
  err:

-    EVP_MD_CTX_destroy(m);
+    EVP_MD_CTX_free(m);

     return rv;
 }
 
     return rv;
 }
 


@@ -412,7 +412,7 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo)
     if (num <= 0)
         return 1;
 
     if (num <= 0)
         return 1;
 

-    m = EVP_MD_CTX_create();
+    m = EVP_MD_CTX_new();

     if (m == NULL)
         goto err_mem;
 
     if (m == NULL)
         goto err_mem;
 


@@ -600,7 +600,7 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo)
     ASYNC_unblock_pause();
     CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
 
     ASYNC_unblock_pause();
     CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
 

-    EVP_MD_CTX_destroy(m);
+    EVP_MD_CTX_free(m);

     if (ok)
         return (1);
     else if (pseudo)
     if (ok)
         return (1);
     else if (pseudo)


@@ -613,11 +613,11 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo)
     }
  err:
     RANDerr(RAND_F_RAND_BYTES, ERR_R_EVP_LIB);
     }
  err:
     RANDerr(RAND_F_RAND_BYTES, ERR_R_EVP_LIB);

-    EVP_MD_CTX_destroy(m);
+    EVP_MD_CTX_free(m);

     return 0;
  err_mem:
     RANDerr(RAND_F_RAND_BYTES, ERR_R_MALLOC_FAILURE);
     return 0;
  err_mem:
     RANDerr(RAND_F_RAND_BYTES, ERR_R_MALLOC_FAILURE);

-    EVP_MD_CTX_destroy(m);
+    EVP_MD_CTX_free(m);

     return 0;
 
 }
     return 0;
 
 }

diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
index 0f742f9969a55e530491f563390b5d08c37242f6..0ad1ef3208563671c87da4ee89ac036ef7af97a7 100644 (file)
--- a/crypto/rsa/rsa_oaep.c
+++ b/crypto/rsa/rsa_oaep.c
@@ -242,7 +242,7 @@ int PKCS1_MGF1(unsigned char *mask, long len,
 {
     long i, outlen = 0;
     unsigned char cnt[4];
 {
     long i, outlen = 0;
     unsigned char cnt[4];

-    EVP_MD_CTX *c = EVP_MD_CTX_create();
+    EVP_MD_CTX *c = EVP_MD_CTX_new();

     unsigned char md[EVP_MAX_MD_SIZE];
     int mdlen;
     int rv = -1;
     unsigned char md[EVP_MAX_MD_SIZE];
     int mdlen;
     int rv = -1;


@@ -274,6 +274,6 @@ int PKCS1_MGF1(unsigned char *mask, long len,
     }
     rv = 0;
  err:
     }
     rv = 0;
  err:

-    EVP_MD_CTX_destroy(c);
+    EVP_MD_CTX_free(c);

     return rv;
 }
     return rv;
 }

diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
index 0a41ae99b1c753ba41641f60e8cfe65bcb8ccb70..5f44dd3ee398b7d8d138ba566bcbb3ef9ae87d3c 100644 (file)
--- a/crypto/rsa/rsa_pss.c
+++ b/crypto/rsa/rsa_pss.c
@@ -88,7 +88,7 @@ int RSA_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
     int hLen, maskedDBLen, MSBits, emLen;
     const unsigned char *H;
     unsigned char *DB = NULL;
     int hLen, maskedDBLen, MSBits, emLen;
     const unsigned char *H;
     unsigned char *DB = NULL;

-    EVP_MD_CTX *ctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *ctx = EVP_MD_CTX_new();

     unsigned char H_[EVP_MAX_MD_SIZE];
 
 
     unsigned char H_[EVP_MAX_MD_SIZE];
 
 


@@ -174,7 +174,7 @@ int RSA_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
 
  err:
     OPENSSL_free(DB);
 
  err:
     OPENSSL_free(DB);

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

 
     return ret;
 
 
     return ret;
 


@@ -244,7 +244,7 @@ int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
     }
     maskedDBLen = emLen - hLen - 1;
     H = EM + maskedDBLen;
     }
     maskedDBLen = emLen - hLen - 1;
     H = EM + maskedDBLen;

-    ctx = EVP_MD_CTX_create();
+    ctx = EVP_MD_CTX_new();

     if (ctx == NULL)
         goto err;
     if (!EVP_DigestInit_ex(ctx, Hash, NULL)
     if (ctx == NULL)
         goto err;
     if (!EVP_DigestInit_ex(ctx, Hash, NULL)


@@ -282,7 +282,7 @@ int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
     ret = 1;
 
  err:
     ret = 1;
 
  err:

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

     OPENSSL_free(salt);
 
     return ret;
     OPENSSL_free(salt);
 
     return ret;

diff --git a/crypto/srp/srp_lib.c b/crypto/srp/srp_lib.c
index 649d2b5a66524dc69560a8706e6b07e82afa6def..0a073b61e0b1f5fc2d902da4824c9c802ea823b5 100644 (file)
--- a/crypto/srp/srp_lib.c
+++ b/crypto/srp/srp_lib.c
@@ -78,7 +78,7 @@ static BIGNUM *srp_Calc_k(BIGNUM *N, BIGNUM *g)
     if (BN_ucmp(g, N) >= 0)
         return NULL;
 
     if (BN_ucmp(g, N) >= 0)
         return NULL;
 

-    ctxt = EVP_MD_CTX_create();
+    ctxt = EVP_MD_CTX_new();

     if (ctxt == NULL)
         return NULL;
     if ((tmp = OPENSSL_malloc(longN)) == NULL)
     if (ctxt == NULL)
         return NULL;
     if ((tmp = OPENSSL_malloc(longN)) == NULL)


@@ -98,7 +98,7 @@ static BIGNUM *srp_Calc_k(BIGNUM *N, BIGNUM *g)
     EVP_DigestFinal_ex(ctxt, digest, NULL);
     res = BN_bin2bn(digest, sizeof(digest), NULL);
  err:
     EVP_DigestFinal_ex(ctxt, digest, NULL);
     res = BN_bin2bn(digest, sizeof(digest), NULL);
  err:

-    EVP_MD_CTX_destroy(ctxt);
+    EVP_MD_CTX_free(ctxt);

     return res;
 }
 
     return res;
 }
 


@@ -119,7 +119,7 @@ BIGNUM *SRP_Calc_u(BIGNUM *A, BIGNUM *B, BIGNUM *N)
 
     longN = BN_num_bytes(N);
 
 
     longN = BN_num_bytes(N);
 

-    ctxt = EVP_MD_CTX_create();
+    ctxt = EVP_MD_CTX_new();

     if (ctxt == NULL)
         return NULL;
     if ((cAB = OPENSSL_malloc(2 * longN)) == NULL)
     if (ctxt == NULL)
         return NULL;
     if ((cAB = OPENSSL_malloc(2 * longN)) == NULL)


@@ -140,7 +140,7 @@ BIGNUM *SRP_Calc_u(BIGNUM *A, BIGNUM *B, BIGNUM *N)
         u = NULL;
     }
  err:
         u = NULL;
     }
  err:

-    EVP_MD_CTX_destroy(ctxt);
+    EVP_MD_CTX_free(ctxt);

 
     return u;
 }
 
     return u;
 }


@@ -213,7 +213,7 @@ BIGNUM *SRP_Calc_x(BIGNUM *s, const char *user, const char *pass)
     if ((s == NULL) || (user == NULL) || (pass == NULL))
         return NULL;
 
     if ((s == NULL) || (user == NULL) || (pass == NULL))
         return NULL;
 

-    ctxt = EVP_MD_CTX_create();
+    ctxt = EVP_MD_CTX_new();

     if (ctxt == NULL)
         return NULL;
     if ((cs = OPENSSL_malloc(BN_num_bytes(s))) == NULL)
     if (ctxt == NULL)
         return NULL;
     if ((cs = OPENSSL_malloc(BN_num_bytes(s))) == NULL)


@@ -234,7 +234,7 @@ BIGNUM *SRP_Calc_x(BIGNUM *s, const char *user, const char *pass)
 
     res = BN_bin2bn(dig, sizeof(dig), NULL);
  err:
 
     res = BN_bin2bn(dig, sizeof(dig), NULL);
  err:

-    EVP_MD_CTX_destroy(ctxt);
+    EVP_MD_CTX_free(ctxt);

     return res;
 }
 
     return res;
 }
 

diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 24fe437e9b68ebdef8b63b7ad14ba120e6618f21..1be68f23406b2345dd57f223173bbb5b121746b5 100644 (file)
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -499,12 +499,12 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)
 
     if (RAND_bytes(digv, SHA_DIGEST_LENGTH) <= 0)
         goto err;
 
     if (RAND_bytes(digv, SHA_DIGEST_LENGTH) <= 0)
         goto err;

-    ctxt = EVP_MD_CTX_create();
+    ctxt = EVP_MD_CTX_new();

     EVP_DigestInit_ex(ctxt, EVP_sha1(), NULL);
     EVP_DigestUpdate(ctxt, vb->seed_key, strlen(vb->seed_key));
     EVP_DigestUpdate(ctxt, username, strlen(username));
     EVP_DigestFinal_ex(ctxt, digs, NULL);
     EVP_DigestInit_ex(ctxt, EVP_sha1(), NULL);
     EVP_DigestUpdate(ctxt, vb->seed_key, strlen(vb->seed_key));
     EVP_DigestUpdate(ctxt, username, strlen(username));
     EVP_DigestFinal_ex(ctxt, digs, NULL);

-    EVP_MD_CTX_destroy(ctxt);
+    EVP_MD_CTX_free(ctxt);

     ctxt = NULL;
     if (SRP_user_pwd_set_sv_BN(user,
                                BN_bin2bn(digs, SHA_DIGEST_LENGTH, NULL),
     ctxt = NULL;
     if (SRP_user_pwd_set_sv_BN(user,
                                BN_bin2bn(digs, SHA_DIGEST_LENGTH, NULL),


@@ -512,7 +512,7 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)
         return user;
 
  err:
         return user;
 
  err:

-    EVP_MD_CTX_destroy(ctxt);
+    EVP_MD_CTX_free(ctxt);

     SRP_user_pwd_free(user);
     return NULL;
 }
     SRP_user_pwd_free(user);
     return NULL;
 }

diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c
index 24c81ee241158c53b9b5201c416ffea085a6b86a..c79db38ab98289c252d87ff67c457e5ea11a399d 100644 (file)
--- a/crypto/ts/ts_rsp_verify.c
+++ b/crypto/ts/ts_rsp_verify.c
@@ -551,7 +551,7 @@ static int ts_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
         goto err;
     }
 
         goto err;
     }
 

-    md_ctx = EVP_MD_CTX_create();
+    md_ctx = EVP_MD_CTX_new();

     if (md_ctx == NULL) {
         TSerr(TS_F_TS_COMPUTE_IMPRINT, ERR_R_MALLOC_FAILURE);
         goto err;
     if (md_ctx == NULL) {
         TSerr(TS_F_TS_COMPUTE_IMPRINT, ERR_R_MALLOC_FAILURE);
         goto err;


@@ -564,11 +564,11 @@ static int ts_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
     }
     if (!EVP_DigestFinal(md_ctx, *imprint, NULL))
         goto err;
     }
     if (!EVP_DigestFinal(md_ctx, *imprint, NULL))
         goto err;

-    EVP_MD_CTX_destroy(md_ctx);
+    EVP_MD_CTX_free(md_ctx);

 
     return 1;
  err:
 
     return 1;
  err:

-    EVP_MD_CTX_destroy(md_ctx);
+    EVP_MD_CTX_free(md_ctx);

     X509_ALGOR_free(*md_alg);
     OPENSSL_free(*imprint);
     *imprint_len = 0;
     X509_ALGOR_free(*md_alg);
     OPENSSL_free(*imprint);
     *imprint_len = 0;

diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 8ea70ace66a4ad6a9084706f0e0a3574c6c20d8e..5c3ac6a66ff8ff2b48c8716226a46fe80aa11ad4 100644 (file)
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -82,7 +82,7 @@ int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)
 unsigned long X509_issuer_and_serial_hash(X509 *a)
 {
     unsigned long ret = 0;
 unsigned long X509_issuer_and_serial_hash(X509 *a)
 {
     unsigned long ret = 0;

-    EVP_MD_CTX *ctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *ctx = EVP_MD_CTX_new();

     unsigned char md[16];
     char *f;
 
     unsigned char md[16];
     char *f;
 


@@ -104,7 +104,7 @@ unsigned long X509_issuer_and_serial_hash(X509 *a)
            ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)
         ) & 0xffffffffL;
  err:
            ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)
         ) & 0xffffffffL;
  err:

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

     return (ret);
 }
 #endif
     return (ret);
 }
 #endif


@@ -249,7 +249,7 @@ unsigned long X509_NAME_hash(X509_NAME *x)
 
 unsigned long X509_NAME_hash_old(X509_NAME *x)
 {
 
 unsigned long X509_NAME_hash_old(X509_NAME *x)
 {

-    EVP_MD_CTX *md_ctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();

     unsigned long ret = 0;
     unsigned char md[16];
 
     unsigned long ret = 0;
     unsigned char md[16];
 


@@ -265,7 +265,7 @@ unsigned long X509_NAME_hash_old(X509_NAME *x)
         ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) |
                ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)
             ) & 0xffffffffL;
         ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) |
                ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)
             ) & 0xffffffffL;

-    EVP_MD_CTX_destroy(md_ctx);
+    EVP_MD_CTX_free(md_ctx);

 
     return (ret);
 }
 
     return (ret);
 }

diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index 02424f1f687470c1499f22077eec9d2b20e6507c..99c655e65bc8d016a04408d2038eae7d2ff86f0b 100644 (file)
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -854,7 +854,7 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
     } else {
         unsigned int md_size_u;
         /* Chop the digest off the end :-) */
     } else {
         unsigned int md_size_u;
         /* Chop the digest off the end :-) */

-        EVP_MD_CTX *md_ctx = EVP_MD_CTX_create();
+        EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();

 
         if (md_ctx == NULL)
             return -1;
 
         if (md_ctx == NULL)
             return -1;


@@ -875,12 +875,12 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
                 || EVP_DigestUpdate(md_ctx, ssl3_pad_2, npad) <= 0
                 || EVP_DigestUpdate(md_ctx, md, md_size) <= 0
                 || EVP_DigestFinal_ex(md_ctx, md, &md_size_u) <= 0) {
                 || EVP_DigestUpdate(md_ctx, ssl3_pad_2, npad) <= 0
                 || EVP_DigestUpdate(md_ctx, md, md_size) <= 0
                 || EVP_DigestFinal_ex(md_ctx, md, &md_size_u) <= 0) {

-            EVP_MD_CTX_init(md_ctx);
+            EVP_MD_CTX_reset(md_ctx);

             return -1;
         }
         md_size = md_size_u;
 
             return -1;
         }
         md_size = md_size_u;
 

-        EVP_MD_CTX_destroy(md_ctx);
+        EVP_MD_CTX_free(md_ctx);

     }
 
     ssl3_record_sequence_update(seq);
     }
 
     ssl3_record_sequence_update(seq);


@@ -918,7 +918,7 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send)
     if (stream_mac) {
         mac_ctx = hash;
     } else {
     if (stream_mac) {
         mac_ctx = hash;
     } else {

-        hmac = EVP_MD_CTX_create();
+        hmac = EVP_MD_CTX_new();

         if (hmac == NULL
                 || !EVP_MD_CTX_copy(hmac, hash))
             return -1;
         if (hmac == NULL
                 || !EVP_MD_CTX_copy(hmac, hash))
             return -1;


@@ -957,14 +957,14 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send)
                                    rec->length + md_size, rec->orig_len,
                                    ssl->s3->read_mac_secret,
                                    ssl->s3->read_mac_secret_size, 0) <= 0) {
                                    rec->length + md_size, rec->orig_len,
                                    ssl->s3->read_mac_secret,
                                    ssl->s3->read_mac_secret_size, 0) <= 0) {

-            EVP_MD_CTX_destroy(hmac);
+            EVP_MD_CTX_free(hmac);

             return -1;
         }
     } else {
         if (EVP_DigestSignUpdate(mac_ctx, header, sizeof(header)) <= 0
                 || EVP_DigestSignUpdate(mac_ctx, rec->input, rec->length) <= 0
                 || EVP_DigestSignFinal(mac_ctx, md, &md_size) <= 0) {
             return -1;
         }
     } else {
         if (EVP_DigestSignUpdate(mac_ctx, header, sizeof(header)) <= 0
                 || EVP_DigestSignUpdate(mac_ctx, rec->input, rec->length) <= 0
                 || EVP_DigestSignFinal(mac_ctx, md, &md_size) <= 0) {

-            EVP_MD_CTX_destroy(hmac);
+            EVP_MD_CTX_free(hmac);

             return -1;
         }
         if (!send && !SSL_USE_ETM(ssl) && FIPS_mode())
             return -1;
         }
         if (!send && !SSL_USE_ETM(ssl) && FIPS_mode())


@@ -973,7 +973,7 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send)
                                   rec->length, rec->orig_len);
     }
 
                                   rec->length, rec->orig_len);
     }
 

-    EVP_MD_CTX_destroy(hmac);
+    EVP_MD_CTX_free(hmac);

 
 #ifdef TLS_DEBUG
     fprintf(stderr, "seq=");
 
 #ifdef TLS_DEBUG
     fprintf(stderr, "seq=");

diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
index 1e46c6692e723411773e63cf59a1e4d5fb95db8b..f07a0451a0d2b85575996c338c84e3697f938a65 100644 (file)
--- a/ssl/s3_cbc.c
+++ b/ssl/s3_cbc.c
@@ -497,7 +497,7 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
             mac_out[j] |= block[j] & is_block_b;
     }
 
             mac_out[j] |= block[j] & is_block_b;
     }
 

-    md_ctx = EVP_MD_CTX_create();
+    md_ctx = EVP_MD_CTX_new();

     if (md_ctx == NULL)
         goto err;
     if (EVP_DigestInit_ex(md_ctx, EVP_MD_CTX_md(ctx), NULL /* engine */ ) <= 0)
     if (md_ctx == NULL)
         goto err;
     if (EVP_DigestInit_ex(md_ctx, EVP_MD_CTX_md(ctx), NULL /* engine */ ) <= 0)


@@ -522,11 +522,11 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
     ret = EVP_DigestFinal(md_ctx, md_out, &md_out_size_u);
     if (ret && md_out_size)
         *md_out_size = md_out_size_u;
     ret = EVP_DigestFinal(md_ctx, md_out, &md_out_size_u);
     if (ret && md_out_size)
         *md_out_size = md_out_size_u;

-    EVP_MD_CTX_destroy(md_ctx);
+    EVP_MD_CTX_free(md_ctx);

 
     return 1;
 err:
 
     return 1;
 err:

-    EVP_MD_CTX_destroy(md_ctx);
+    EVP_MD_CTX_free(md_ctx);

     return 0;
 }
 
     return 0;
 }
 

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 026f2c83955c107dbc9f2723ef71c869ae3ba960..c20bff2e75756d172e426c3551bf5e9c4da85625 100644 (file)
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -153,8 +153,8 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
     c = os_toascii[c];          /* 'A' in ASCII */
 #endif
     k = 0;
     c = os_toascii[c];          /* 'A' in ASCII */
 #endif
     k = 0;

-    m5 = EVP_MD_CTX_create();
-    s1 = EVP_MD_CTX_create();
+    m5 = EVP_MD_CTX_new();
+    s1 = EVP_MD_CTX_new();

     if (m5 == NULL || s1 == NULL) {
         SSLerr(SSL_F_SSL3_GENERATE_KEY_BLOCK, ERR_R_MALLOC_FAILURE);
         goto err;
     if (m5 == NULL || s1 == NULL) {
         SSLerr(SSL_F_SSL3_GENERATE_KEY_BLOCK, ERR_R_MALLOC_FAILURE);
         goto err;


@@ -194,8 +194,8 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
     OPENSSL_cleanse(smd, sizeof(smd));
     ret = 1;
  err:
     OPENSSL_cleanse(smd, sizeof(smd));
     ret = 1;
  err:

-    EVP_MD_CTX_destroy(m5);
-    EVP_MD_CTX_destroy(s1);
+    EVP_MD_CTX_free(m5);
+    EVP_MD_CTX_free(s1);

     return ret;
 }
 
     return ret;
 }
 


@@ -447,7 +447,7 @@ void ssl3_free_digest_list(SSL *s)
 {
     BIO_free(s->s3->handshake_buffer);
     s->s3->handshake_buffer = NULL;
 {
     BIO_free(s->s3->handshake_buffer);
     s->s3->handshake_buffer = NULL;

-    EVP_MD_CTX_destroy(s->s3->handshake_dgst);
+    EVP_MD_CTX_free(s->s3->handshake_dgst);

     s->s3->handshake_dgst = NULL;
 }
 
     s->s3->handshake_dgst = NULL;
 }
 


@@ -472,7 +472,7 @@ int ssl3_digest_cached_records(SSL *s, int keep)
             return 0;
         }
 
             return 0;
         }
 

-        s->s3->handshake_dgst = EVP_MD_CTX_create();
+        s->s3->handshake_dgst = EVP_MD_CTX_new();

         if (s->s3->handshake_dgst == NULL) {
             SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS, ERR_R_MALLOC_FAILURE);
             return 0;
         if (s->s3->handshake_dgst == NULL) {
             SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS, ERR_R_MALLOC_FAILURE);
             return 0;


@@ -509,7 +509,7 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p)
         return 0;
     }
 
         return 0;
     }
 

-    ctx = EVP_MD_CTX_create();
+    ctx = EVP_MD_CTX_new();

     if (ctx == NULL) {
         SSLerr(SSL_F_SSL3_FINAL_FINISH_MAC, ERR_R_MALLOC_FAILURE);
         return 0;
     if (ctx == NULL) {
         SSLerr(SSL_F_SSL3_FINAL_FINISH_MAC, ERR_R_MALLOC_FAILURE);
         return 0;


@@ -518,7 +518,7 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p)
 
     ret = EVP_MD_CTX_size(ctx);
     if (ret < 0) {
 
     ret = EVP_MD_CTX_size(ctx);
     if (ret < 0) {

-        EVP_MD_CTX_init(ctx);
+        EVP_MD_CTX_reset(ctx);

         return 0;
     }
 
         return 0;
     }
 


@@ -531,7 +531,7 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p)
         ret = 0;
     }
 
         ret = 0;
     }
 

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

 
     return ret;
 }
 
     return ret;
 }


@@ -551,7 +551,7 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
 #endif
     };
     unsigned char buf[EVP_MAX_MD_SIZE];
 #endif
     };
     unsigned char buf[EVP_MAX_MD_SIZE];

-    EVP_MD_CTX *ctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *ctx = EVP_MD_CTX_new();

     int i, ret = 0;
     unsigned int n;
 #ifdef OPENSSL_SSL_TRACE_CRYPTO
     int i, ret = 0;
     unsigned int n;
 #ifdef OPENSSL_SSL_TRACE_CRYPTO


@@ -584,7 +584,7 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
         out += n;
         ret += n;
     }
         out += n;
         ret += n;
     }

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

 
 #ifdef OPENSSL_SSL_TRACE_CRYPTO
     if (ret > 0 && s->msg_callback) {
 
 #ifdef OPENSSL_SSL_TRACE_CRYPTO
     if (ret > 0 && s->msg_callback) {

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index adbb7bb95a88ac77c67740e92fdc965cd4f72821..3ca7c3ffa69661f5fa2b9c0845d007d33ad60b03 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -3177,9 +3177,9 @@ void SSL_set_not_resumable_session_callback(SSL *ssl,
 EVP_MD_CTX *ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md)
 {
     ssl_clear_hash_ctx(hash);
 EVP_MD_CTX *ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md)
 {
     ssl_clear_hash_ctx(hash);

-    *hash = EVP_MD_CTX_create();
+    *hash = EVP_MD_CTX_new();

     if (*hash == NULL || (md && EVP_DigestInit_ex(*hash, md, NULL) <= 0)) {
     if (*hash == NULL || (md && EVP_DigestInit_ex(*hash, md, NULL) <= 0)) {

-        EVP_MD_CTX_destroy(*hash);
+        EVP_MD_CTX_free(*hash);

         *hash = NULL;
         return NULL;
     }
         *hash = NULL;
         return NULL;
     }


@@ -3190,7 +3190,7 @@ void ssl_clear_hash_ctx(EVP_MD_CTX **hash)
 {
 
     if (*hash)
 {
 
     if (*hash)

-        EVP_MD_CTX_destroy(*hash);
+        EVP_MD_CTX_free(*hash);

     *hash = NULL;
 }
 
     *hash = NULL;
 }
 


@@ -3204,7 +3204,7 @@ int ssl_handshake_hash(SSL *s, unsigned char *out, int outlen)
         ret = 0;
         goto err;
     }
         ret = 0;
         goto err;
     }

-    ctx = EVP_MD_CTX_create();
+    ctx = EVP_MD_CTX_new();

     if (ctx == NULL) {
         ret = 0;
         goto err;
     if (ctx == NULL) {
         ret = 0;
         goto err;


@@ -3213,7 +3213,7 @@ int ssl_handshake_hash(SSL *s, unsigned char *out, int outlen)
         || EVP_DigestFinal_ex(ctx, out, NULL) <= 0)
         ret = 0;
  err:
         || EVP_DigestFinal_ex(ctx, out, NULL) <= 0)
         ret = 0;
  err:

-    EVP_MD_CTX_destroy(ctx);
+    EVP_MD_CTX_free(ctx);

     return ret;
 }
 
     return ret;
 }
 

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index f19ac8e38abc9b85aef7e6cd93127929e8bfa4de..60c0983def033022e4fc9dca57a68b8c3e3639be 100644 (file)
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -1592,7 +1592,7 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
 #endif
     PACKET save_param_start, signature;
 
 #endif
     PACKET save_param_start, signature;
 

-    md_ctx = EVP_MD_CTX_create();
+    md_ctx = EVP_MD_CTX_new();

     if (md_ctx == NULL) {
         al = SSL_AD_INTERNAL_ERROR;
         SSLerr(SSL_F_TLS_PROCESS_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
     if (md_ctx == NULL) {
         al = SSL_AD_INTERNAL_ERROR;
         SSLerr(SSL_F_TLS_PROCESS_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);


@@ -1921,7 +1921,7 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
         }
     }
     EVP_PKEY_free(pkey);
         }
     }
     EVP_PKEY_free(pkey);

-    EVP_MD_CTX_destroy(md_ctx);
+    EVP_MD_CTX_free(md_ctx);

     return MSG_PROCESS_CONTINUE_READING;
  f_err:
     ssl3_send_alert(s, SSL3_AL_FATAL, al);
     return MSG_PROCESS_CONTINUE_READING;
  f_err:
     ssl3_send_alert(s, SSL3_AL_FATAL, al);


@@ -1938,7 +1938,7 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
     EC_POINT_free(srvr_ecpoint);
     EC_KEY_free(ecdh);
 #endif
     EC_POINT_free(srvr_ecpoint);
     EC_KEY_free(ecdh);
 #endif

-    EVP_MD_CTX_destroy(md_ctx);
+    EVP_MD_CTX_free(md_ctx);

     ossl_statem_set_error(s);
     return MSG_PROCESS_ERROR;
 }
     ossl_statem_set_error(s);
     return MSG_PROCESS_ERROR;
 }


@@ -2721,7 +2721,7 @@ psk_err:
          * Compute shared IV and store it in algorithm-specific context
          * data
          */
          * Compute shared IV and store it in algorithm-specific context
          * data
          */

-        ukm_hash = EVP_MD_CTX_create();
+        ukm_hash = EVP_MD_CTX_new();

         if (EVP_DigestInit(ukm_hash,
                            EVP_get_digestbynid(dgst_nid)) <= 0
                 || EVP_DigestUpdate(ukm_hash, s->s3->client_random,
         if (EVP_DigestInit(ukm_hash,
                            EVP_get_digestbynid(dgst_nid)) <= 0
                 || EVP_DigestUpdate(ukm_hash, s->s3->client_random,


@@ -2729,12 +2729,12 @@ psk_err:
                 || EVP_DigestUpdate(ukm_hash, s->s3->server_random,
                                     SSL3_RANDOM_SIZE) <= 0
                 || EVP_DigestFinal_ex(ukm_hash, shared_ukm, &md_len) <= 0) {
                 || EVP_DigestUpdate(ukm_hash, s->s3->server_random,
                                     SSL3_RANDOM_SIZE) <= 0
                 || EVP_DigestFinal_ex(ukm_hash, shared_ukm, &md_len) <= 0) {

-            EVP_MD_CTX_destroy(ukm_hash);
+            EVP_MD_CTX_free(ukm_hash);

             SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE,
                    ERR_R_INTERNAL_ERROR);
             goto err;
         }
             SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE,
                    ERR_R_INTERNAL_ERROR);
             goto err;
         }

-        EVP_MD_CTX_destroy(ukm_hash);
+        EVP_MD_CTX_free(ukm_hash);

         if (EVP_PKEY_CTX_ctrl
             (pkey_ctx, -1, EVP_PKEY_OP_ENCRYPT, EVP_PKEY_CTRL_SET_IV, 8,
              shared_ukm) < 0) {
         if (EVP_PKEY_CTX_ctrl
             (pkey_ctx, -1, EVP_PKEY_OP_ENCRYPT, EVP_PKEY_CTRL_SET_IV, 8,
              shared_ukm) < 0) {


@@ -2905,7 +2905,7 @@ int tls_construct_client_verify(SSL *s)
     long hdatalen = 0;
     void *hdata;
 
     long hdatalen = 0;
     void *hdata;
 

-    mctx = EVP_MD_CTX_create();
+    mctx = EVP_MD_CTX_new();

     if (mctx == NULL) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_MALLOC_FAILURE);
         goto err;
     if (mctx == NULL) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_MALLOC_FAILURE);
         goto err;


@@ -2958,10 +2958,10 @@ int tls_construct_client_verify(SSL *s)
         goto err;
     }
 
         goto err;
     }
 

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     return 1;
  err:
     return 1;
  err:

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     return 0;
 }
 
     return 0;
 }
 

diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index aafd28f8de64558ef044231854be4275152365e9..6d73659df64ff3253b327a631e1e3cd3f8d95fe0 100644 (file)
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -204,8 +204,7 @@ void dtls1_hm_fragment_free(hm_fragment *frag)
     if (frag->msg_header.is_ccs) {
         EVP_CIPHER_CTX_free(frag->msg_header.
                             saved_retransmit_state.enc_write_ctx);
     if (frag->msg_header.is_ccs) {
         EVP_CIPHER_CTX_free(frag->msg_header.
                             saved_retransmit_state.enc_write_ctx);

-        EVP_MD_CTX_destroy(frag->msg_header.
-                           saved_retransmit_state.write_hash);
+        EVP_MD_CTX_free(frag->msg_header.saved_retransmit_state.write_hash);

     }
     OPENSSL_free(frag->fragment);
     OPENSSL_free(frag->reassembly);
     }
     OPENSSL_free(frag->fragment);
     OPENSSL_free(frag->reassembly);

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index f1d1796d1e01a24bedce673907bc1df2cd18a368..3ccb28777e096bebcb58f37a767919b3543db6b6 100644 (file)
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1733,7 +1733,7 @@ int tls_construct_server_key_exchange(SSL *s)
     BIGNUM *r[4];
     int nr[4], kn;
     BUF_MEM *buf;
     BIGNUM *r[4];
     int nr[4], kn;
     BUF_MEM *buf;

-    EVP_MD_CTX *md_ctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();

 
     if (md_ctx == NULL) {
         SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
 
     if (md_ctx == NULL) {
         SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);


@@ -2075,7 +2075,7 @@ int tls_construct_server_key_exchange(SSL *s)
         goto f_err;
     }
 
         goto f_err;
     }
 

-    EVP_MD_CTX_destroy(md_ctx);
+    EVP_MD_CTX_free(md_ctx);

     return 1;
  f_err:
     ssl3_send_alert(s, SSL3_AL_FATAL, al);
     return 1;
  f_err:
     ssl3_send_alert(s, SSL3_AL_FATAL, al);


@@ -2084,7 +2084,7 @@ int tls_construct_server_key_exchange(SSL *s)
     OPENSSL_free(encodedPoint);
     BN_CTX_free(bn_ctx);
 #endif
     OPENSSL_free(encodedPoint);
     BN_CTX_free(bn_ctx);
 #endif

-    EVP_MD_CTX_destroy(md_ctx);
+    EVP_MD_CTX_free(md_ctx);

     ossl_statem_set_error(s);
     return 0;
 }
     ossl_statem_set_error(s);
     return 0;
 }


@@ -2888,7 +2888,7 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
     long hdatalen = 0;
     void *hdata;
 
     long hdatalen = 0;
     void *hdata;
 

-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();

 
     if (mctx == NULL) {
         SSLerr(SSL_F_TLS_PROCESS_CERT_VERIFY, ERR_R_MALLOC_FAILURE);
 
     if (mctx == NULL) {
         SSLerr(SSL_F_TLS_PROCESS_CERT_VERIFY, ERR_R_MALLOC_FAILURE);


@@ -3013,7 +3013,7 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
     }
     BIO_free(s->s3->handshake_buffer);
     s->s3->handshake_buffer = NULL;
     }
     BIO_free(s->s3->handshake_buffer);
     s->s3->handshake_buffer = NULL;

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     EVP_PKEY_free(pkey);
     return ret;
 }
     EVP_PKEY_free(pkey);
     return ret;
 }

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 05a0ec7caac2177d3426f5f06c3d2ef9422664b5..5889558d7eacba44dabdf44b19a53171fdb59441 100644 (file)
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -166,9 +166,9 @@ static int tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
     chunk = EVP_MD_size(md);
     OPENSSL_assert(chunk >= 0);
 
     chunk = EVP_MD_size(md);
     OPENSSL_assert(chunk >= 0);
 

-    ctx = EVP_MD_CTX_create();
-    ctx_tmp = EVP_MD_CTX_create();
-    ctx_init = EVP_MD_CTX_create();
+    ctx = EVP_MD_CTX_new();
+    ctx_tmp = EVP_MD_CTX_new();
+    ctx_init = EVP_MD_CTX_new();

     if (ctx == NULL || ctx_tmp == NULL || ctx_init == NULL)
         goto err;
     EVP_MD_CTX_set_flags(ctx_init, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
     if (ctx == NULL || ctx_tmp == NULL || ctx_init == NULL)
         goto err;
     EVP_MD_CTX_set_flags(ctx_init, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);


@@ -230,9 +230,9 @@ static int tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
     ret = 1;
  err:
     EVP_PKEY_free(mac_key);
     ret = 1;
  err:
     EVP_PKEY_free(mac_key);

-    EVP_MD_CTX_destroy(ctx);
-    EVP_MD_CTX_destroy(ctx_tmp);
-    EVP_MD_CTX_destroy(ctx_init);
+    EVP_MD_CTX_free(ctx);
+    EVP_MD_CTX_free(ctx_tmp);
+    EVP_MD_CTX_free(ctx_init);

     OPENSSL_cleanse(A1, sizeof(A1));
     return ret;
 }
     OPENSSL_cleanse(A1, sizeof(A1));
     return ret;
 }


@@ -374,7 +374,7 @@ int tls1_change_cipher_state(SSL *s, int which)
             goto err;
         dd = s->enc_write_ctx;
         if (SSL_IS_DTLS(s)) {
             goto err;
         dd = s->enc_write_ctx;
         if (SSL_IS_DTLS(s)) {

-            mac_ctx = EVP_MD_CTX_create();
+            mac_ctx = EVP_MD_CTX_new();

             if (mac_ctx == NULL)
                 goto err;
             s->write_hash = mac_ctx;
             if (mac_ctx == NULL)
                 goto err;
             s->write_hash = mac_ctx;

diff --git a/test/ecdsatest.c b/test/ecdsatest.c
index dcd9ba0a5584539dfa91c4dec2a43cf2a17db0c7..a55a553df860e6648051a777fef8a206da14634e 100644 (file)
--- a/test/ecdsatest.c
+++ b/test/ecdsatest.c
@@ -188,7 +188,7 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
     const char message[] = "abc";
     unsigned char digest[20];
     unsigned int dgst_len = 0;
     const char message[] = "abc";
     unsigned char digest[20];
     unsigned int dgst_len = 0;

-    EVP_MD_CTX *md_ctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();

     EC_KEY *key = NULL;
     ECDSA_SIG *signature = NULL;
     BIGNUM *r = NULL, *s = NULL;
     EC_KEY *key = NULL;
     ECDSA_SIG *signature = NULL;
     BIGNUM *r = NULL, *s = NULL;


@@ -246,7 +246,7 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
     ECDSA_SIG_free(signature);
     BN_free(r);
     BN_free(s);
     ECDSA_SIG_free(signature);
     BN_free(r);
     BN_free(s);

-    EVP_MD_CTX_destroy(md_ctx);
+    EVP_MD_CTX_free(md_ctx);

     BN_clear_free(kinv);
     BN_clear_free(rp);
     return ret;
     BN_clear_free(kinv);
     BN_clear_free(rp);
     return ret;

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 50c9e918f2fcb36b2013653b0d58ae7a2a2095e2..a5363085f5d1d2837e19d367a699af7391e73f88 100644 (file)
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -279,8 +279,8 @@ static int test_EVP_DigestSignInit(void)
     size_t sig_len = 0;
     EVP_MD_CTX *md_ctx, *md_ctx_verify;
 
     size_t sig_len = 0;
     EVP_MD_CTX *md_ctx, *md_ctx_verify;
 

-    md_ctx = EVP_MD_CTX_create();
-    md_ctx_verify = EVP_MD_CTX_create();
+    md_ctx = EVP_MD_CTX_new();
+    md_ctx_verify = EVP_MD_CTX_new();

     if (md_ctx == NULL || md_ctx_verify == NULL)
         goto out;
 
     if (md_ctx == NULL || md_ctx_verify == NULL)
         goto out;
 


@@ -319,8 +319,8 @@ static int test_EVP_DigestSignInit(void)
         ERR_print_errors_fp(stderr);
     }
 
         ERR_print_errors_fp(stderr);
     }
 

-    EVP_MD_CTX_destroy(md_ctx);
-    EVP_MD_CTX_destroy(md_ctx_verify);
+    EVP_MD_CTX_free(md_ctx);
+    EVP_MD_CTX_free(md_ctx_verify);

     EVP_PKEY_free(pkey);
     OPENSSL_free(sig);
 
     EVP_PKEY_free(pkey);
     OPENSSL_free(sig);
 


@@ -333,7 +333,7 @@ static int test_EVP_DigestVerifyInit(void)
     EVP_PKEY *pkey = NULL;
     EVP_MD_CTX *md_ctx;
 
     EVP_PKEY *pkey = NULL;
     EVP_MD_CTX *md_ctx;
 

-    md_ctx = EVP_MD_CTX_create();
+    md_ctx = EVP_MD_CTX_new();

 
     pkey = load_example_rsa_key();
     if (pkey == NULL ||
 
     pkey = load_example_rsa_key();
     if (pkey == NULL ||


@@ -349,7 +349,7 @@ static int test_EVP_DigestVerifyInit(void)
         ERR_print_errors_fp(stderr);
     }
 
         ERR_print_errors_fp(stderr);
     }
 

-    EVP_MD_CTX_destroy(md_ctx);
+    EVP_MD_CTX_free(md_ctx);

     EVP_PKEY_free(pkey);
 
     return ret;
     EVP_PKEY_free(pkey);
 
     return ret;

diff --git a/test/evp_test.c b/test/evp_test.c
index 92e153f2d3057aecbc3a997d356c7fe2ddd4f80f..725af8a53a15902d365e4bf6e6d897916dc8b83e 100644 (file)
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -691,7 +691,7 @@ static int digest_test_run(struct evp_test *t)
     EVP_MD_CTX *mctx;
     unsigned char md[EVP_MAX_MD_SIZE];
     unsigned int md_len;
     EVP_MD_CTX *mctx;
     unsigned char md[EVP_MAX_MD_SIZE];
     unsigned int md_len;

-    mctx = EVP_MD_CTX_create();
+    mctx = EVP_MD_CTX_new();

     if (!mctx)
         goto err;
     err = "DIGESTINIT_ERROR";
     if (!mctx)
         goto err;
     err = "DIGESTINIT_ERROR";


@@ -713,7 +713,7 @@ static int digest_test_run(struct evp_test *t)
         goto err;
     err = NULL;
  err:
         goto err;
     err = NULL;
  err:

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     t->err = err;
     return 1;
 }
     t->err = err;
     return 1;
 }


@@ -1100,7 +1100,7 @@ static int mac_test_run(struct evp_test *t)
         if (!md)
             goto err;
     }
         if (!md)
             goto err;
     }

-    mctx = EVP_MD_CTX_create();
+    mctx = EVP_MD_CTX_new();

     if (!mctx)
         goto err;
     err = "DIGESTSIGNINIT_ERROR";
     if (!mctx)
         goto err;
     err = "DIGESTSIGNINIT_ERROR";


@@ -1128,7 +1128,7 @@ static int mac_test_run(struct evp_test *t)
         goto err;
     err = NULL;
  err:
         goto err;
     err = NULL;
  err:

-    EVP_MD_CTX_destroy(mctx);
+    EVP_MD_CTX_free(mctx);

     OPENSSL_free(mac);
     EVP_PKEY_CTX_free(genctx);
     EVP_PKEY_free(key);
     OPENSSL_free(mac);
     EVP_PKEY_CTX_free(genctx);
     EVP_PKEY_free(key);

diff --git a/test/gost2814789test.c b/test/gost2814789test.c
index 486326cefe544948c1346a7b44d73e82ce77fb1e..2ab0782f8063dfb8043d6896e5be5552e8a3ea71 100644 (file)
--- a/test/gost2814789test.c
+++ b/test/gost2814789test.c
@@ -1391,7 +1391,7 @@ int main(int argc, char *argv[])
                  */
                 continue;
             }
                  */
                 continue;
             }

-            mctx = EVP_MD_CTX_create();
+            mctx = EVP_MD_CTX_new();

             if (mctx == NULL) {
                 fflush(NULL);
                 fprintf(stderr, "ENGINE_ctrl_cmd_string: malloc failure\n");
             if (mctx == NULL) {
                 fflush(NULL);
                 fprintf(stderr, "ENGINE_ctrl_cmd_string: malloc failure\n");


@@ -1417,7 +1417,7 @@ int main(int argc, char *argv[])
             siglen = 4;
             OPENSSL_assert(EVP_DigestSignFinal(mctx, bTest, &siglen));
             EVP_PKEY_free(mac_key);
             siglen = 4;
             OPENSSL_assert(EVP_DigestSignFinal(mctx, bTest, &siglen));
             EVP_PKEY_free(mac_key);

-            EVP_MD_CTX_destroy(mctx);
+            EVP_MD_CTX_free(mctx);

             enlu = (int)tcs[t].ullLen;
             enlf = 0;
             l = siglen;
             enlu = (int)tcs[t].ullLen;
             enlf = 0;
             l = siglen;

diff --git a/test/mdc2test.c b/test/mdc2test.c
index 4cf952c3f53f984754ebc957272d9205bdb98113..938a3c13b750d805b451cf7fda57114f1dcb132e 100644 (file)
--- a/test/mdc2test.c
+++ b/test/mdc2test.c
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
     ebcdic2ascii(text, text, strlen(text));
 # endif
 
     ebcdic2ascii(text, text, strlen(text));
 # endif
 

-    c = EVP_MD_CTX_create();
+    c = EVP_MD_CTX_new();

     EVP_DigestInit_ex(c, EVP_mdc2(), NULL);
     EVP_DigestUpdate(c, (unsigned char *)text, strlen(text));
     EVP_DigestFinal_ex(c, &(md[0]), NULL);
     EVP_DigestInit_ex(c, EVP_mdc2(), NULL);
     EVP_DigestUpdate(c, (unsigned char *)text, strlen(text));
     EVP_DigestFinal_ex(c, &(md[0]), NULL);


@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
     } else
         printf("pad2 - ok\n");
 
     } else
         printf("pad2 - ok\n");
 

-    EVP_MD_CTX_destroy(c);
+    EVP_MD_CTX_free(c);

 # ifdef OPENSSL_SYS_NETWARE
     if (ret)
         printf("ERROR: %d\n", ret);
 # ifdef OPENSSL_SYS_NETWARE
     if (ret)
         printf("ERROR: %d\n", ret);

diff --git a/test/sha1test.c b/test/sha1test.c
index 6b8ad42141e56791f0fed63ffa51523742e594b2..676cc84839c9bd54b385ad35433e870d183aaffb 100644 (file)
--- a/test/sha1test.c
+++ b/test/sha1test.c
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
     ebcdic2ascii(test[1], test[1], strlen(test[1]));
 #endif
 
     ebcdic2ascii(test[1], test[1], strlen(test[1]));
 #endif
 

-    c = EVP_MD_CTX_create();
+    c = EVP_MD_CTX_new();

     P = test;
     R = ret;
     i = 1;
     P = test;
     R = ret;
     i = 1;


@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
         printf("ERROR: %d\n", err);
 #endif
     EXIT(err);
         printf("ERROR: %d\n", err);
 #endif
     EXIT(err);

-    EVP_MD_CTX_destroy(c);
+    EVP_MD_CTX_free(c);

     return (0);
 }
 
     return (0);
 }
 

diff --git a/test/sha256t.c b/test/sha256t.c
index 25f762f82be8bc0116b4db02e50058193ac8661b..2ff9ed2a715333f9da91dc6936e5c9fcc8f4c195 100644 (file)
--- a/test/sha256t.c
+++ b/test/sha256t.c
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
         fprintf(stdout, ".");
     fflush(stdout);
 
         fprintf(stdout, ".");
     fflush(stdout);
 

-    evp = EVP_MD_CTX_create();
+    evp = EVP_MD_CTX_new();

     if (evp == NULL) {
         fflush(stdout);
         fprintf(stderr, "\nTEST 3 of 3 failed. (malloc failure)\n");
     if (evp == NULL) {
         fflush(stdout);
         fprintf(stderr, "\nTEST 3 of 3 failed. (malloc failure)\n");


@@ -133,14 +133,14 @@ int main(int argc, char **argv)
         fprintf(stdout, ".");
     fflush(stdout);
 
         fprintf(stdout, ".");
     fflush(stdout);
 

-    EVP_MD_CTX_init(evp);
+    EVP_MD_CTX_reset(evp);

     EVP_DigestInit_ex(evp, EVP_sha224(), NULL);
     for (i = 0; i < 1000000; i += 64)
         EVP_DigestUpdate(evp, "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa"
                          "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa",
                          (1000000 - i) < 64 ? 1000000 - i : 64);
     EVP_DigestFinal_ex(evp, md, NULL);
     EVP_DigestInit_ex(evp, EVP_sha224(), NULL);
     for (i = 0; i < 1000000; i += 64)
         EVP_DigestUpdate(evp, "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa"
                          "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa",
                          (1000000 - i) < 64 ? 1000000 - i : 64);
     EVP_DigestFinal_ex(evp, md, NULL);

-    EVP_MD_CTX_destroy(evp);
+    EVP_MD_CTX_free(evp);

 
     if (memcmp(md, addenum_3, sizeof(addenum_3))) {
         fflush(stdout);
 
     if (memcmp(md, addenum_3, sizeof(addenum_3))) {
         fflush(stdout);

diff --git a/test/sha512t.c b/test/sha512t.c
index dff19aaa5701fda7edaa8a4013f860f872a24d2e..e1f30de2ce6fdf517dea8f8d04a115dcf4907e84 100644 (file)
--- a/test/sha512t.c
+++ b/test/sha512t.c
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
         fprintf(stdout, ".");
     fflush(stdout);
 
         fprintf(stdout, ".");
     fflush(stdout);
 

-    evp = EVP_MD_CTX_create();
+    evp = EVP_MD_CTX_new();

     if (evp == NULL) {
         fflush(stdout);
         fprintf(stderr, "\nTEST 3 of 3 failed. (malloc failure)\n");
     if (evp == NULL) {
         fflush(stdout);
         fprintf(stderr, "\nTEST 3 of 3 failed. (malloc failure)\n");


@@ -132,7 +132,7 @@ int main(int argc, char **argv)
                          "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa",
                          (1000000 - i) < 288 ? 1000000 - i : 288);
     EVP_DigestFinal_ex(evp, md, NULL);
                          "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa",
                          (1000000 - i) < 288 ? 1000000 - i : 288);
     EVP_DigestFinal_ex(evp, md, NULL);

-    EVP_MD_CTX_init(evp);
+    EVP_MD_CTX_reset(evp);

 
     if (memcmp(md, app_c3, sizeof(app_c3))) {
         fflush(stdout);
 
     if (memcmp(md, app_c3, sizeof(app_c3))) {
         fflush(stdout);


@@ -174,7 +174,7 @@ int main(int argc, char **argv)
                          "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa",
                          (1000000 - i) < 64 ? 1000000 - i : 64);
     EVP_DigestFinal_ex(evp, md, NULL);
                          "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa",
                          (1000000 - i) < 64 ? 1000000 - i : 64);
     EVP_DigestFinal_ex(evp, md, NULL);

-    EVP_MD_CTX_destroy(evp);
+    EVP_MD_CTX_free(evp);

 
     if (memcmp(md, app_d3, sizeof(app_d3))) {
         fflush(stdout);
 
     if (memcmp(md, app_d3, sizeof(app_d3))) {
         fflush(stdout);