Change builting PBE to use static table. Add entries for HMAC and MD5, GOST.

diff --git a/CHANGES b/CHANGES
index 412c9fd3718e6f4237ecbb5ea1b2792485a351ab..f3cc5046ad5c7849334765730a570d26cd4becd7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,8 @@
  Changes between 0.9.8b and 0.9.9  [xx XXX xxxx]
 
   *) Initial support for PKCS#5 v2.0 PRFs other than default SHA1 HMAC.
  Changes between 0.9.8b and 0.9.9  [xx XXX xxxx]
 
   *) Initial support for PKCS#5 v2.0 PRFs other than default SHA1 HMAC.

+     Reorganize PBE internals to lookup from a static table using NIDs,
+     add support for HMAC PBE OID translation.

      [Steve Henson]
 
   *) Replace the algorithm specific calls to generate keys in "req" with the
      [Steve Henson]
 
   *) Replace the algorithm specific calls to generate keys in "req" with the

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index fc968123657e11628aa9d3c14acd4108fbd56b13..fc16432a05e40eadb5b2bbe5e27e13bb07370d7c 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -183,6 +183,4 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
        EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
 #endif
        EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
        EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
 #endif

-       PKCS12_PBE_add();
-       PKCS5_PBE_add();

        }
        }

diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index c634e1b643760b10741be345d43582540e80e830..82115acf64422f56685e3d299dc57dd5978909c0 100644 (file)
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>

+#include <openssl/pkcs12.h>

 #include <openssl/x509.h>
 
 /* Password based encryption (PBE) functions */
 #include <openssl/x509.h>
 
 /* Password based encryption (PBE) functions */


@@ -76,6 +77,71 @@ typedef struct
        EVP_PBE_KEYGEN *keygen;
        } EVP_PBE_CTL;
 
        EVP_PBE_KEYGEN *keygen;
        } EVP_PBE_CTL;
 

+EVP_PBE_CTL builtin_pbe[] = 
+       {
+       {EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndDES_CBC,
+                       NID_des_cbc, NID_md2, PKCS5_PBE_keyivgen},
+       {EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndDES_CBC,
+                       NID_des_cbc, NID_md5, PKCS5_PBE_keyivgen},
+       {EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndRC2_CBC,
+                       NID_rc2_64_cbc, NID_sha1, PKCS5_PBE_keyivgen},
+
+       {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC4,
+                       NID_rc4, NID_sha1, PKCS12_PBE_keyivgen},
+       {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC4,
+                       NID_rc4_40, NID_sha1, PKCS12_PBE_keyivgen},
+       {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
+                       NID_des_ede3_cbc, NID_sha1, PKCS12_PBE_keyivgen},
+       {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And2_Key_TripleDES_CBC, 
+                       NID_des_ede_cbc, NID_sha1, PKCS12_PBE_keyivgen},
+       {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC2_CBC,
+                       NID_rc2_cbc, NID_sha1, PKCS12_PBE_keyivgen},
+       {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC2_CBC,
+                       NID_rc2_40_cbc, NID_sha1, PKCS12_PBE_keyivgen},
+
+#ifndef OPENSSL_NO_HMAC
+       {EVP_PBE_TYPE_OUTER, NID_pbes2, -1, -1, PKCS5_v2_PBE_keyivgen},
+#endif
+       {EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndRC2_CBC,
+                       NID_rc2_64_cbc, NID_md2, PKCS5_PBE_keyivgen},
+       {EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndRC2_CBC,
+                       NID_rc2_64_cbc, NID_md5, PKCS5_PBE_keyivgen},
+       {EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndDES_CBC,
+                       NID_des_cbc, NID_sha1, PKCS5_PBE_keyivgen},
+
+
+       {EVP_PBE_TYPE_PRF, NID_hmacWithSHA1, -1, NID_sha1, 0},
+       {EVP_PBE_TYPE_PRF, NID_id_HMACGostR3411_94, -1, NID_id_GostR3411_94, 0},
+       {EVP_PBE_TYPE_PRF, NID_hmacWithMD5, -1, NID_md5, 0},
+       };
+
+#ifdef TEST
+int main(int argc, char **argv)
+       {
+       int i, nid_md, nid_cipher;
+       EVP_PBE_CTL *tpbe, *tpbe2;
+       /*OpenSSL_add_all_algorithms();*/
+
+       for (i = 0; i < sizeof(builtin_pbe)/sizeof(EVP_PBE_CTL); i++)
+               {
+               tpbe = builtin_pbe + i;
+               fprintf(stderr, "%d %d %s ", tpbe->pbe_type, tpbe->pbe_nid,
+                                               OBJ_nid2sn(tpbe->pbe_nid));
+               if (EVP_PBE_find(tpbe->pbe_type, tpbe->pbe_nid,
+                                       &nid_cipher ,&nid_md,0))
+                       fprintf(stderr, "Found %s %s\n",
+                                       OBJ_nid2sn(nid_cipher),
+                                       OBJ_nid2sn(nid_md));
+               else
+                       fprintf(stderr, "Find ERROR!!\n");
+               }
+
+       return 0;
+       }
+#endif
+               
+
+

 int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
             ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de)
        {
 int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
             ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de)
        {


@@ -118,6 +184,17 @@ int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
        return 1;       
 }
 
        return 1;       
 }
 

+static int pbe_cmp2(const void *a, const void *b)
+       {
+       const EVP_PBE_CTL *pbe1 = a;
+       const EVP_PBE_CTL *pbe2 = b;
+       int ret = pbe1->pbe_type - pbe2->pbe_type;
+       if (ret)
+               return ret;
+       else
+               return pbe1->pbe_nid - pbe2->pbe_nid;
+       }
+

 static int pbe_cmp(const char * const *a, const char * const *b)
        {
        const EVP_PBE_CTL * const *pbe1 = (const EVP_PBE_CTL * const *) a,
 static int pbe_cmp(const char * const *a, const char * const *b)
        {
        const EVP_PBE_CTL * const *pbe1 = (const EVP_PBE_CTL * const *) a,


@@ -173,16 +250,30 @@ int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
 int EVP_PBE_find(int type, int pbe_nid,
                        int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen)
        {
 int EVP_PBE_find(int type, int pbe_nid,
                        int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen)
        {

-       EVP_PBE_CTL *pbetmp, pbelu;
+       EVP_PBE_CTL *pbetmp = NULL, pbelu;

        int i;
        if (pbe_nid == NID_undef)
                return 0;
        int i;
        if (pbe_nid == NID_undef)
                return 0;

+

        pbelu.pbe_type = type;
        pbelu.pbe_nid = pbe_nid;
        pbelu.pbe_type = type;
        pbelu.pbe_nid = pbe_nid;

-       i = sk_find(pbe_algs, (char *)&pbelu);
-       if (i == -1)
+
+       if (pbe_algs)
+               {
+               i = sk_find(pbe_algs, (char *)&pbelu);
+               if (i != -1)
+                       pbetmp = (EVP_PBE_CTL *)sk_value (pbe_algs, i);
+               }
+       if (pbetmp == NULL)
+               {
+               pbetmp = (EVP_PBE_CTL *) OBJ_bsearch((char *)&pbelu,
+                       (char *)builtin_pbe,
+                       sizeof(builtin_pbe)/sizeof(EVP_PBE_CTL),
+                       sizeof(EVP_PBE_CTL),
+                       pbe_cmp2);
+               }
+       if (pbetmp == NULL)

                return 0;
                return 0;

-       pbetmp = (EVP_PBE_CTL *)sk_value (pbe_algs, i);

        if (pcnid)
                *pcnid = pbetmp->cipher_nid;
        if (pmnid)
        if (pcnid)
                *pcnid = pbetmp->cipher_nid;
        if (pmnid)

diff --git a/crypto/evp/p5_crpt.c b/crypto/evp/p5_crpt.c
index 185a153601dac5afbb4ccd71abca12ff2889eacf..1c4a47bd408113c56f5505e7df96abfee28cea36 100644 (file)
--- a/crypto/evp/p5_crpt.c
+++ b/crypto/evp/p5_crpt.c
@@ -62,43 +62,11 @@
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 

-/* PKCS#5 v1.5 compatible PBE functions: see PKCS#5 v2.0 for more info.
+/* Doesn't do anything now: Builtin PBE algorithms in static table.

  */
 
 void PKCS5_PBE_add(void)
 {
  */
 
 void PKCS5_PBE_add(void)
 {

-#ifndef OPENSSL_NO_DES
-#  ifndef OPENSSL_NO_MD5
-EVP_PBE_alg_add(NID_pbeWithMD5AndDES_CBC, EVP_des_cbc(), EVP_md5(),
-                                                        PKCS5_PBE_keyivgen);
-#  endif
-#  ifndef OPENSSL_NO_MD2
-EVP_PBE_alg_add(NID_pbeWithMD2AndDES_CBC, EVP_des_cbc(), EVP_md2(),
-                                                        PKCS5_PBE_keyivgen);
-#  endif
-#  ifndef OPENSSL_NO_SHA
-EVP_PBE_alg_add(NID_pbeWithSHA1AndDES_CBC, EVP_des_cbc(), EVP_sha1(),
-                                                        PKCS5_PBE_keyivgen);
-#  endif
-#endif
-#ifndef OPENSSL_NO_RC2
-#  ifndef OPENSSL_NO_MD5
-EVP_PBE_alg_add(NID_pbeWithMD5AndRC2_CBC, EVP_rc2_64_cbc(), EVP_md5(),
-                                                        PKCS5_PBE_keyivgen);
-#  endif
-#  ifndef OPENSSL_NO_MD2
-EVP_PBE_alg_add(NID_pbeWithMD2AndRC2_CBC, EVP_rc2_64_cbc(), EVP_md2(),
-                                                        PKCS5_PBE_keyivgen);
-#  endif
-#  ifndef OPENSSL_NO_SHA
-EVP_PBE_alg_add(NID_pbeWithSHA1AndRC2_CBC, EVP_rc2_64_cbc(), EVP_sha1(),
-                                                        PKCS5_PBE_keyivgen);
-#  endif
-#endif
-#ifndef OPENSSL_NO_HMAC
-EVP_PBE_alg_add(NID_pbes2, NULL, NULL, PKCS5_v2_PBE_keyivgen);
-EVP_PBE_alg_add_type(EVP_PBE_TYPE_PRF, NID_hmacWithSHA1, -1, NID_sha1, 0);
-#endif

 }
 
 int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
 }
 
 int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,

diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c
index 3ad33c49d82d7adb44f3892027932275cf8b5639..0ae077075d2bf251233e791bb0b9b86d68772dcd 100644 (file)
--- a/crypto/pkcs12/p12_crpt.c
+++ b/crypto/pkcs12/p12_crpt.c
@@ -60,28 +60,10 @@
 #include "cryptlib.h"
 #include <openssl/pkcs12.h>
 
 #include "cryptlib.h"
 #include <openssl/pkcs12.h>
 

-/* PKCS#12 specific PBE functions */
+/* PKCS#12 PBE algorithms now in static table */

 
 void PKCS12_PBE_add(void)
 {
 
 void PKCS12_PBE_add(void)
 {

-#ifndef OPENSSL_NO_RC4
-EVP_PBE_alg_add(NID_pbe_WithSHA1And128BitRC4, EVP_rc4(), EVP_sha1(),
-                                                        PKCS12_PBE_keyivgen);
-EVP_PBE_alg_add(NID_pbe_WithSHA1And40BitRC4, EVP_rc4_40(), EVP_sha1(),
-                                                        PKCS12_PBE_keyivgen);
-#endif
-#ifndef OPENSSL_NO_DES
-EVP_PBE_alg_add(NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
-                       EVP_des_ede3_cbc(), EVP_sha1(), PKCS12_PBE_keyivgen);
-EVP_PBE_alg_add(NID_pbe_WithSHA1And2_Key_TripleDES_CBC, 
-                       EVP_des_ede_cbc(), EVP_sha1(), PKCS12_PBE_keyivgen);
-#endif
-#ifndef OPENSSL_NO_RC2
-EVP_PBE_alg_add(NID_pbe_WithSHA1And128BitRC2_CBC, EVP_rc2_cbc(),
-                                       EVP_sha1(), PKCS12_PBE_keyivgen);
-EVP_PBE_alg_add(NID_pbe_WithSHA1And40BitRC2_CBC, EVP_rc2_40_cbc(),
-                                       EVP_sha1(), PKCS12_PBE_keyivgen);
-#endif

 }
 
 int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
 }
 
 int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,