|
@@ -10,6 +10,8 @@
|
|
|
#include <stdio.h>
|
|
|
#include "internal/cryptlib.h"
|
|
|
#include <openssl/evp.h>
|
|
|
+#include <openssl/core.h>
|
|
|
+#include <openssl/core_names.h>
|
|
|
#include <openssl/pkcs12.h>
|
|
|
#include <openssl/x509.h>
|
|
|
#include "crypto/evp.h"
|
|
@@ -25,41 +27,42 @@ struct evp_pbe_st {
|
|
|
int cipher_nid;
|
|
|
int md_nid;
|
|
|
EVP_PBE_KEYGEN *keygen;
|
|
|
+ EVP_PBE_KEYGEN_EX *keygen_ex;
|
|
|
};
|
|
|
|
|
|
static STACK_OF(EVP_PBE_CTL) *pbe_algs;
|
|
|
|
|
|
static const EVP_PBE_CTL builtin_pbe[] = {
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndDES_CBC,
|
|
|
- NID_des_cbc, NID_md2, PKCS5_PBE_keyivgen},
|
|
|
+ NID_des_cbc, NID_md2, PKCS5_PBE_keyivgen, NULL},
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndDES_CBC,
|
|
|
- NID_des_cbc, NID_md5, PKCS5_PBE_keyivgen},
|
|
|
+ NID_des_cbc, NID_md5, PKCS5_PBE_keyivgen, NULL},
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndRC2_CBC,
|
|
|
- NID_rc2_64_cbc, NID_sha1, PKCS5_PBE_keyivgen},
|
|
|
+ NID_rc2_64_cbc, NID_sha1, PKCS5_PBE_keyivgen, NULL},
|
|
|
|
|
|
{EVP_PBE_TYPE_OUTER, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen},
|
|
|
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC4,
|
|
|
- NID_rc4, NID_sha1, PKCS12_PBE_keyivgen},
|
|
|
+ NID_rc4, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC4,
|
|
|
- NID_rc4_40, NID_sha1, PKCS12_PBE_keyivgen},
|
|
|
+ NID_rc4_40, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
|
|
|
- NID_des_ede3_cbc, NID_sha1, PKCS12_PBE_keyivgen},
|
|
|
+ NID_des_ede3_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And2_Key_TripleDES_CBC,
|
|
|
- NID_des_ede_cbc, NID_sha1, PKCS12_PBE_keyivgen},
|
|
|
+ NID_des_ede_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC2_CBC,
|
|
|
- NID_rc2_cbc, NID_sha1, PKCS12_PBE_keyivgen},
|
|
|
+ NID_rc2_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC2_CBC,
|
|
|
- NID_rc2_40_cbc, NID_sha1, PKCS12_PBE_keyivgen},
|
|
|
+ NID_rc2_40_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
|
|
|
|
|
|
- {EVP_PBE_TYPE_OUTER, NID_pbes2, -1, -1, PKCS5_v2_PBE_keyivgen},
|
|
|
+ {EVP_PBE_TYPE_OUTER, NID_pbes2, -1, -1, PKCS5_v2_PBE_keyivgen, &PKCS5_v2_PBE_keyivgen_ex},
|
|
|
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndRC2_CBC,
|
|
|
- NID_rc2_64_cbc, NID_md2, PKCS5_PBE_keyivgen},
|
|
|
+ NID_rc2_64_cbc, NID_md2, PKCS5_PBE_keyivgen, NULL},
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndRC2_CBC,
|
|
|
- NID_rc2_64_cbc, NID_md5, PKCS5_PBE_keyivgen},
|
|
|
+ NID_rc2_64_cbc, NID_md5, PKCS5_PBE_keyivgen, NULL},
|
|
|
{EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndDES_CBC,
|
|
|
- NID_des_cbc, NID_sha1, PKCS5_PBE_keyivgen},
|
|
|
+ NID_des_cbc, NID_sha1, PKCS5_PBE_keyivgen, NULL},
|
|
|
|
|
|
{EVP_PBE_TYPE_PRF, NID_hmacWithSHA1, -1, NID_sha1, 0},
|
|
|
{EVP_PBE_TYPE_PRF, NID_hmac_md5, -1, NID_md5, 0},
|
|
@@ -76,22 +79,27 @@ static const EVP_PBE_CTL builtin_pbe[] = {
|
|
|
NID_id_GostR3411_2012_512, 0},
|
|
|
{EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_224, -1, NID_sha512_224, 0},
|
|
|
{EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_256, -1, NID_sha512_256, 0},
|
|
|
- {EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen},
|
|
|
+ {EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen, &PKCS5_v2_PBKDF2_keyivgen_ex},
|
|
|
#ifndef OPENSSL_NO_SCRYPT
|
|
|
- {EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen}
|
|
|
+ {EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen, &PKCS5_v2_scrypt_keyivgen_ex}
|
|
|
#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_ex(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
|
|
|
+ ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de,
|
|
|
+ OSSL_LIB_CTX *libctx, const char *propq)
|
|
|
{
|
|
|
- const EVP_CIPHER *cipher;
|
|
|
- const EVP_MD *md;
|
|
|
- int cipher_nid, md_nid;
|
|
|
+ const EVP_CIPHER *cipher = NULL;
|
|
|
+ EVP_CIPHER *cipher_fetch = NULL;
|
|
|
+ const EVP_MD *md = NULL;
|
|
|
+ EVP_MD *md_fetch = NULL;
|
|
|
+ int ret = 0, cipher_nid, md_nid;
|
|
|
+ EVP_PBE_KEYGEN_EX *keygen_ex;
|
|
|
EVP_PBE_KEYGEN *keygen;
|
|
|
|
|
|
- if (!EVP_PBE_find(EVP_PBE_TYPE_OUTER, OBJ_obj2nid(pbe_obj),
|
|
|
- &cipher_nid, &md_nid, &keygen)) {
|
|
|
+ if (!EVP_PBE_find_ex(EVP_PBE_TYPE_OUTER, OBJ_obj2nid(pbe_obj),
|
|
|
+ &cipher_nid, &md_nid, &keygen, &keygen_ex)) {
|
|
|
char obj_tmp[80];
|
|
|
|
|
|
if (pbe_obj == NULL)
|
|
@@ -100,7 +108,7 @@ int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
|
|
|
i2t_ASN1_OBJECT(obj_tmp, sizeof(obj_tmp), pbe_obj);
|
|
|
ERR_raise_data(ERR_LIB_EVP, EVP_R_UNKNOWN_PBE_ALGORITHM,
|
|
|
"TYPE=%s", obj_tmp);
|
|
|
- return 0;
|
|
|
+ goto err;
|
|
|
}
|
|
|
|
|
|
if (pass == NULL)
|
|
@@ -108,28 +116,48 @@ int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
|
|
|
else if (passlen == -1)
|
|
|
passlen = strlen(pass);
|
|
|
|
|
|
- if (cipher_nid == -1)
|
|
|
- cipher = NULL;
|
|
|
- else {
|
|
|
- cipher = EVP_get_cipherbynid(cipher_nid);
|
|
|
- if (!cipher) {
|
|
|
+ if (cipher_nid != -1) {
|
|
|
+ cipher = cipher_fetch = EVP_CIPHER_fetch(libctx, OBJ_nid2sn(cipher_nid), propq);
|
|
|
+ /* Fallback to legacy method */
|
|
|
+ if (cipher == NULL)
|
|
|
+ cipher = EVP_get_cipherbynid(cipher_nid);
|
|
|
+
|
|
|
+ if (cipher == NULL) {
|
|
|
ERR_raise_data(ERR_LIB_EVP, EVP_R_UNKNOWN_CIPHER,
|
|
|
OBJ_nid2sn(cipher_nid));
|
|
|
- return 0;
|
|
|
+ goto err;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (md_nid == -1)
|
|
|
- md = NULL;
|
|
|
- else {
|
|
|
- md = EVP_get_digestbynid(md_nid);
|
|
|
- if (!md) {
|
|
|
+ if (md_nid != -1) {
|
|
|
+ md = md_fetch = EVP_MD_fetch(libctx, OBJ_nid2sn(md_nid), propq);
|
|
|
+ /* Fallback to legacy method */
|
|
|
+ if (md == NULL)
|
|
|
+ EVP_get_digestbynid(md_nid);
|
|
|
+
|
|
|
+ if (md == NULL) {
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_UNKNOWN_DIGEST);
|
|
|
- return 0;
|
|
|
+ goto err;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- return keygen(ctx, pass, passlen, param, cipher, md, en_de);
|
|
|
+ /* Try extended keygen with libctx/propq first, fall back to legacy keygen */
|
|
|
+ if (keygen_ex != NULL)
|
|
|
+ ret = keygen_ex(ctx, pass, passlen, param, cipher, md, en_de, libctx, propq);
|
|
|
+ else
|
|
|
+ ret = keygen(ctx, pass, passlen, param, cipher, md, en_de);
|
|
|
+
|
|
|
+err:
|
|
|
+ EVP_CIPHER_free(cipher_fetch);
|
|
|
+ EVP_MD_free(md_fetch);
|
|
|
+
|
|
|
+ return ret;
|
|
|
+}
|
|
|
+
|
|
|
+int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
|
|
|
+ ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de)
|
|
|
+{
|
|
|
+ return EVP_PBE_CipherInit_ex(pbe_obj, pass, passlen, param, ctx, en_de, NULL, NULL);
|
|
|
}
|
|
|
|
|
|
DECLARE_OBJ_BSEARCH_CMP_FN(EVP_PBE_CTL, EVP_PBE_CTL, pbe2);
|
|
@@ -205,8 +233,8 @@ int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
|
|
|
cipher_nid, md_nid, keygen);
|
|
|
}
|
|
|
|
|
|
-int EVP_PBE_find(int type, int pbe_nid,
|
|
|
- int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen)
|
|
|
+int EVP_PBE_find_ex(int type, int pbe_nid, int *pcnid, int *pmnid,
|
|
|
+ EVP_PBE_KEYGEN **pkeygen, EVP_PBE_KEYGEN_EX **pkeygen_ex)
|
|
|
{
|
|
|
EVP_PBE_CTL *pbetmp = NULL, pbelu;
|
|
|
int i;
|
|
@@ -225,15 +253,23 @@ int EVP_PBE_find(int type, int pbe_nid,
|
|
|
}
|
|
|
if (pbetmp == NULL)
|
|
|
return 0;
|
|
|
- if (pcnid)
|
|
|
+ if (pcnid != NULL)
|
|
|
*pcnid = pbetmp->cipher_nid;
|
|
|
- if (pmnid)
|
|
|
+ if (pmnid != NULL)
|
|
|
*pmnid = pbetmp->md_nid;
|
|
|
- if (pkeygen)
|
|
|
+ if (pkeygen != NULL)
|
|
|
*pkeygen = pbetmp->keygen;
|
|
|
+ if (pkeygen_ex != NULL)
|
|
|
+ *pkeygen_ex = pbetmp->keygen_ex;
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+int EVP_PBE_find(int type, int pbe_nid,
|
|
|
+ int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen)
|
|
|
+{
|
|
|
+ return EVP_PBE_find_ex(type, pbe_nid, pcnid, pmnid, pkeygen, NULL);
|
|
|
+}
|
|
|
+
|
|
|
static void free_evp_pbe_ctl(EVP_PBE_CTL *pbe)
|
|
|
{
|
|
|
OPENSSL_free(pbe);
|