size_t-fication of message digest APIs. We should size_t-fy more APIs...

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

diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c
index ef3f941a7e5f5c593ca38860a19ebad09ceca01e..f2e143d2a68c2e6472d9c3cd97d45ca28cfbe6f9 100644 (file)
--- a/crypto/evp/p5_crpt2.c
+++ b/crypto/evp/p5_crpt2.c
@@ -57,10 +57,18 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
  */
 #include <stdio.h>
 #include <stdlib.h>

+#include "cryptlib.h"
+#if !defined(OPENSSL_NO_HMAC) && !defined(OPENSSL_NO_SHA)

 #include <openssl/x509.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>

-#include "cryptlib.h"
+
+/* set this to print out info about the keygen algorithm */
+/* #define DEBUG_PKCS5V2 */
+
+#ifdef DEBUG_PKCS5V2
+       static void h__dump (const unsigned char *p, int len);
+#endif

 
 /* This is an implementation of PKCS#5 v2.0 password based encryption key
  * derivation function PBKDF2 using the only currently defined function HMAC
 
 /* This is an implementation of PKCS#5 v2.0 password based encryption key
  * derivation function PBKDF2 using the only currently defined function HMAC


@@ -69,26 +77,30 @@
  */
 
 int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
  */
 
 int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,

-                          unsigned char *salt, int saltlen, int iter,
+                          const unsigned char *salt, int saltlen, int iter,

                           int keylen, unsigned char *out)
 {
        unsigned char digtmp[SHA_DIGEST_LENGTH], *p, itmp[4];
                           int keylen, unsigned char *out)
 {
        unsigned char digtmp[SHA_DIGEST_LENGTH], *p, itmp[4];

-       int cplen, j, k;
+       int cplen, j, k, tkeylen;

        unsigned long i = 1;
        HMAC_CTX hctx;
        unsigned long i = 1;
        HMAC_CTX hctx;

+
+       HMAC_CTX_init(&hctx);

        p = out;
        p = out;

-       if(passlen == -1) passlen = strlen(pass);
-       while(keylen) {
-               if(keylen > SHA_DIGEST_LENGTH) cplen = SHA_DIGEST_LENGTH;
-               else cplen = keylen;
+       tkeylen = keylen;
+       if(!pass) passlen = 0;
+       else if(passlen == -1) passlen = strlen(pass);
+       while(tkeylen) {
+               if(tkeylen > SHA_DIGEST_LENGTH) cplen = SHA_DIGEST_LENGTH;
+               else cplen = tkeylen;

                /* We are unlikely to ever use more than 256 blocks (5120 bits!)
                 * but just in case...
                 */
                /* We are unlikely to ever use more than 256 blocks (5120 bits!)
                 * but just in case...
                 */

-               itmp[0] = (i >> 24) & 0xff;
-               itmp[1] = (i >> 16) & 0xff;
-               itmp[2] = (i >> 8) & 0xff;
-               itmp[3] = i & 0xff;
-               HMAC_Init(&hctx, pass, passlen, EVP_sha1());
+               itmp[0] = (unsigned char)((i >> 24) & 0xff);
+               itmp[1] = (unsigned char)((i >> 16) & 0xff);
+               itmp[2] = (unsigned char)((i >> 8) & 0xff);
+               itmp[3] = (unsigned char)(i & 0xff);
+               HMAC_Init_ex(&hctx, pass, passlen, EVP_sha1(), NULL);

                HMAC_Update(&hctx, salt, saltlen);
                HMAC_Update(&hctx, itmp, 4);
                HMAC_Final(&hctx, digtmp, NULL);
                HMAC_Update(&hctx, salt, saltlen);
                HMAC_Update(&hctx, itmp, 4);
                HMAC_Final(&hctx, digtmp, NULL);


@@ -98,11 +110,20 @@ int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
                                 digtmp, SHA_DIGEST_LENGTH, digtmp, NULL);
                        for(k = 0; k < cplen; k++) p[k] ^= digtmp[k];
                }
                                 digtmp, SHA_DIGEST_LENGTH, digtmp, NULL);
                        for(k = 0; k < cplen; k++) p[k] ^= digtmp[k];
                }

-               keylen-= cplen;
+               tkeylen-= cplen;

                i++;
                p+= cplen;
        }
                i++;
                p+= cplen;
        }

-       HMAC_cleanup(&hctx);
+       HMAC_CTX_cleanup(&hctx);
+#ifdef DEBUG_PKCS5V2
+       fprintf(stderr, "Password:\n");
+       h__dump (pass, passlen);
+       fprintf(stderr, "Salt:\n");
+       h__dump (salt, saltlen);
+       fprintf(stderr, "Iteration count %d\n", iter);
+       fprintf(stderr, "Key:\n");
+       h__dump (out, keylen);
+#endif

        return 1;
 }
 
        return 1;
 }
 


@@ -124,11 +145,13 @@ main()
  */
 
 int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
  */
 
 int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,

-                         ASN1_TYPE *param, EVP_CIPHER *c, EVP_MD *md,
+                         ASN1_TYPE *param, const EVP_CIPHER *c, const EVP_MD *md,

                          int en_de)
 {
                          int en_de)
 {

-       unsigned char *pbuf, *salt, key[EVP_MAX_KEY_LENGTH];
-       int saltlen, keylen, iter, plen;
+       unsigned char *salt, key[EVP_MAX_KEY_LENGTH];
+       const unsigned char *pbuf;
+       int saltlen, iter, plen;
+       unsigned int keylen;

        PBE2PARAM *pbe2 = NULL;
        const EVP_CIPHER *cipher;
        PBKDF2PARAM *kdf = NULL;
        PBE2PARAM *pbe2 = NULL;
        const EVP_CIPHER *cipher;
        PBKDF2PARAM *kdf = NULL;


@@ -162,13 +185,14 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
        }
 
        /* Fixup cipher based on AlgorithmIdentifier */
        }
 
        /* Fixup cipher based on AlgorithmIdentifier */

-       EVP_CipherInit(ctx, cipher, NULL, NULL, en_de);
+       EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, en_de);

        if(EVP_CIPHER_asn1_to_param(ctx, pbe2->encryption->parameter) < 0) {
                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
                                        EVP_R_CIPHER_PARAMETER_ERROR);
                goto err;
        }
        keylen = EVP_CIPHER_CTX_key_length(ctx);
        if(EVP_CIPHER_asn1_to_param(ctx, pbe2->encryption->parameter) < 0) {
                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
                                        EVP_R_CIPHER_PARAMETER_ERROR);
                goto err;
        }
        keylen = EVP_CIPHER_CTX_key_length(ctx);

+       OPENSSL_assert(keylen <= sizeof key);

 
        /* Now decode key derivation function */
 
 
        /* Now decode key derivation function */
 


@@ -186,7 +210,7 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
 
        /* Now check the parameters of the kdf */
 
 
        /* Now check the parameters of the kdf */
 

-       if(kdf->keylength && (ASN1_INTEGER_get(kdf->keylength) != keylen)){
+       if(kdf->keylength && (ASN1_INTEGER_get(kdf->keylength) != (int)keylen)){

                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
                                                EVP_R_UNSUPPORTED_KEYLENGTH);
                goto err;
                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
                                                EVP_R_UNSUPPORTED_KEYLENGTH);
                goto err;


@@ -208,8 +232,8 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
        saltlen = kdf->salt->value.octet_string->length;
        iter = ASN1_INTEGER_get(kdf->iter);
        PKCS5_PBKDF2_HMAC_SHA1(pass, passlen, salt, saltlen, iter, keylen, key);
        saltlen = kdf->salt->value.octet_string->length;
        iter = ASN1_INTEGER_get(kdf->iter);
        PKCS5_PBKDF2_HMAC_SHA1(pass, passlen, salt, saltlen, iter, keylen, key);

-       EVP_CipherInit(ctx, NULL, key, NULL, en_de);
-       memset(key, 0, keylen);
+       EVP_CipherInit_ex(ctx, NULL, NULL, key, NULL, en_de);
+       OPENSSL_cleanse(key, keylen);

        PBKDF2PARAM_free(kdf);
        return 1;
 
        PBKDF2PARAM_free(kdf);
        return 1;
 


@@ -219,3 +243,11 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
        return 0;
 }
 
        return 0;
 }
 

+#ifdef DEBUG_PKCS5V2
+static void h__dump (const unsigned char *p, int len)
+{
+        for (; len --; p++) fprintf(stderr, "%02X ", *p);
+        fprintf(stderr, "\n");
+}
+#endif
+#endif