Have other crypto/evp files include evp_locl.h

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

diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c
index 3e2c989954e76fc813eb45e8c5831dd334b0f003..231c06b86e4204671f202e54b6171e311e7bcce3 100644 (file)
--- a/crypto/evp/evp_key.c
+++ b/crypto/evp/evp_key.c
@@ -123,7 +123,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
                    int datal, int count, unsigned char *key,
                    unsigned char *iv)
 {
                    int datal, int count, unsigned char *key,
                    unsigned char *iv)
 {

-    EVP_MD_CTX c;
+    EVP_MD_CTX *c;

     unsigned char md_buf[EVP_MAX_MD_SIZE];
     int niv, nkey, addmd = 0;
     unsigned int mds = 0, i;
     unsigned char md_buf[EVP_MAX_MD_SIZE];
     int niv, nkey, addmd = 0;
     unsigned int mds = 0, i;


@@ -136,27 +136,29 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
     if (data == NULL)
         return (nkey);
 
     if (data == NULL)
         return (nkey);
 

-    EVP_MD_CTX_init(&c);
+    c = EVP_MD_CTX_create();
+    if (c == NULL)
+        goto err;

     for (;;) {
     for (;;) {

-        if (!EVP_DigestInit_ex(&c, md, NULL))
+        if (!EVP_DigestInit_ex(c, md, NULL))

             goto err;
         if (addmd++)
             goto err;
         if (addmd++)

-            if (!EVP_DigestUpdate(&c, &(md_buf[0]), mds))
+            if (!EVP_DigestUpdate(c, &(md_buf[0]), mds))

                 goto err;
                 goto err;

-        if (!EVP_DigestUpdate(&c, data, datal))
+        if (!EVP_DigestUpdate(c, data, datal))

             goto err;
         if (salt != NULL)
             goto err;
         if (salt != NULL)

-            if (!EVP_DigestUpdate(&c, salt, PKCS5_SALT_LEN))
+            if (!EVP_DigestUpdate(c, salt, PKCS5_SALT_LEN))

                 goto err;
                 goto err;

-        if (!EVP_DigestFinal_ex(&c, &(md_buf[0]), &mds))
+        if (!EVP_DigestFinal_ex(c, &(md_buf[0]), &mds))

             goto err;
 
         for (i = 1; i < (unsigned int)count; i++) {
             goto err;
 
         for (i = 1; i < (unsigned int)count; i++) {

-            if (!EVP_DigestInit_ex(&c, md, NULL))
+            if (!EVP_DigestInit_ex(c, md, NULL))

                 goto err;
                 goto err;

-            if (!EVP_DigestUpdate(&c, &(md_buf[0]), mds))
+            if (!EVP_DigestUpdate(c, &(md_buf[0]), mds))

                 goto err;
                 goto err;

-            if (!EVP_DigestFinal_ex(&c, &(md_buf[0]), &mds))
+            if (!EVP_DigestFinal_ex(c, &(md_buf[0]), &mds))

                 goto err;
         }
         i = 0;
                 goto err;
         }
         i = 0;


@@ -189,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_cleanup(&c);
+    EVP_MD_CTX_destroy(c);

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