Commit 97e4a932 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

This is the main PKCS#5 v2.0 key generation function, it parses the ASN1 

structure and decides what key to generate (if any). Not currently added to
the PBE algorithm list because it is largely untested.
parent 3928b6bf

crypto/asn1/asn1_err.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_PACK(0,ASN1_F_PKCS12_MAC_DATA_NEW,0),	"PKCS12_MAC_DATA_new"},

{ERR_PACK(0,ASN1_F_PKCS12_NEW,0),	"PKCS12_new"},

{ERR_PACK(0,ASN1_F_PKCS12_SAFEBAG_NEW,0),	"PKCS12_SAFEBAG_new"},

{ERR_PACK(0,ASN1_F_PKCS5_PBE2_SET,0),	"PKCS5_PBE2_SET"},

{ERR_PACK(0,ASN1_F_PKCS5_PBE2_SET,0),	"PKCS5_pbe2_set"},

{ERR_PACK(0,ASN1_F_PKCS7_DIGEST_NEW,0),	"PKCS7_DIGEST_new"},

{ERR_PACK(0,ASN1_F_PKCS7_ENCRYPT_NEW,0),	"PKCS7_ENCRYPT_new"},

{ERR_PACK(0,ASN1_F_PKCS7_ENC_CONTENT_NEW,0),	"PKCS7_ENC_CONTENT_new"},

crypto/asn1/p5_pbev2.c

+0 −1
Original line number Diff line number Diff line
@@ -270,4 +270,3 @@ X509_ALGOR *PKCS5_pbe2_set(EVP_CIPHER *cipher, int iter, unsigned char *salt, 
	return NULL;



}

crypto/evp/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c \ 
	m_ripemd.c \

	p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \

	bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \

	c_all.c evp_lib.c bio_ok.c evp_pkey.c evp_pbe.c p5_crpt.c

	c_all.c evp_lib.c bio_ok.c evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c



LIBOBJ=	encode.o digest.o evp_enc.o evp_key.o \

	e_ecb_d.o e_cbc_d.o e_cfb_d.o e_ofb_d.o \
@@ -50,7 +50,7 @@ LIBOBJ= encode.o digest.o evp_enc.o evp_key.o \ 
	m_ripemd.o \

	p_open.o p_seal.o p_sign.o p_verify.o p_lib.o p_enc.o p_dec.o \

	bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o \

	c_all.o evp_lib.o bio_ok.o evp_pkey.o evp_pbe.o p5_crpt.o

	c_all.o evp_lib.o bio_ok.o evp_pkey.o evp_pbe.o p5_crpt.o p5_crpt2.o



SRC= $(LIBSRC)

crypto/evp/evp.h

+13 −1
Original line number Diff line number Diff line
@@ -640,6 +640,12 @@ int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c,ASN1_TYPE *type); 
int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,

			 ASN1_TYPE *param, EVP_CIPHER *cipher, EVP_MD *md,

			 int en_de);

int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,

				unsigned char *salt, int saltlen, int iter,

					 int keylen, unsigned char *out);

int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,

			 ASN1_TYPE *param, EVP_CIPHER *cipher, EVP_MD *md,

			 int en_de);



void PKCS5_PBE_add(void);
@@ -663,7 +669,6 @@ void EVP_PBE_cleanup(void); 
#define EVP_F_EVP_OPENINIT				 102

#define EVP_F_EVP_PBE_ALG_ADD				 115

#define EVP_F_EVP_PBE_CIPHERINIT			 116

#define EVP_F_EVP_PKCS5_PBE_KEYIVGEN			 117

#define EVP_F_EVP_PKCS82PKEY				 111

#define EVP_F_EVP_PKCS8_SET_BROKEN			 112

#define EVP_F_EVP_PKEY2PKCS8				 113
@@ -673,12 +678,15 @@ void EVP_PBE_cleanup(void); 
#define EVP_F_EVP_PKEY_NEW				 106

#define EVP_F_EVP_SIGNFINAL				 107

#define EVP_F_EVP_VERIFYFINAL				 108

#define EVP_F_PKCS5_PBE_KEYIVGEN			 117

#define EVP_F_PKCS5_V2_PBE_KEYIVGEN			 118

#define EVP_F_RC2_MAGIC_TO_METH				 109



/* Reason codes. */

#define EVP_R_BAD_DECRYPT				 100

#define EVP_R_BN_DECODE_ERROR				 112

#define EVP_R_BN_PUBKEY_ERROR				 113

#define EVP_R_CIPHER_PARAMETER_ERROR			 122

#define EVP_R_DECODE_ERROR				 114

#define EVP_R_DIFFERENT_KEY_TYPES			 101

#define EVP_R_ENCODE_ERROR				 115
@@ -694,8 +702,12 @@ void EVP_PBE_cleanup(void); 
#define EVP_R_PUBLIC_KEY_NOT_RSA			 106

#define EVP_R_UNKNOWN_PBE_ALGORITHM			 121

#define EVP_R_UNSUPPORTED_CIPHER			 107

#define EVP_R_UNSUPPORTED_KEYLENGTH			 123

#define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION	 124

#define EVP_R_UNSUPPORTED_KEY_SIZE			 108

#define EVP_R_UNSUPPORTED_PRF				 125

#define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM		 118

#define EVP_R_UNSUPPORTED_SALT_TYPE			 126

#define EVP_R_WRONG_FINAL_BLOCK_LENGTH			 109

#define EVP_R_WRONG_PUBLIC_KEY_TYPE			 110

crypto/evp/evp_err.c

+7 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ static ERR_STRING_DATA EVP_str_functs[]= 
{ERR_PACK(0,EVP_F_EVP_OPENINIT,0),	"EVP_OpenInit"},

{ERR_PACK(0,EVP_F_EVP_PBE_ALG_ADD,0),	"EVP_PBE_alg_add"},

{ERR_PACK(0,EVP_F_EVP_PBE_CIPHERINIT,0),	"EVP_PBE_CipherInit"},

{ERR_PACK(0,EVP_F_EVP_PKCS5_PBE_KEYIVGEN,0),	"EVP_PKCS5_PBE_KEYIVGEN"},

{ERR_PACK(0,EVP_F_EVP_PKCS82PKEY,0),	"EVP_PKCS82PKEY"},

{ERR_PACK(0,EVP_F_EVP_PKCS8_SET_BROKEN,0),	"EVP_PKCS8_SET_BROKEN"},

{ERR_PACK(0,EVP_F_EVP_PKEY2PKCS8,0),	"EVP_PKEY2PKCS8"},
@@ -81,6 +80,8 @@ static ERR_STRING_DATA EVP_str_functs[]= 
{ERR_PACK(0,EVP_F_EVP_PKEY_NEW,0),	"EVP_PKEY_new"},

{ERR_PACK(0,EVP_F_EVP_SIGNFINAL,0),	"EVP_SignFinal"},

{ERR_PACK(0,EVP_F_EVP_VERIFYFINAL,0),	"EVP_VerifyFinal"},

{ERR_PACK(0,EVP_F_PKCS5_PBE_KEYIVGEN,0),	"PKCS5_PBE_keyivgen"},

{ERR_PACK(0,EVP_F_PKCS5_V2_PBE_KEYIVGEN,0),	"PKCS5_v2_PBE_keyivgen"},

{ERR_PACK(0,EVP_F_RC2_MAGIC_TO_METH,0),	"RC2_MAGIC_TO_METH"},

{0,NULL}

	};
@@ -90,6 +91,7 @@ static ERR_STRING_DATA EVP_str_reasons[]= 
{EVP_R_BAD_DECRYPT                       ,"bad decrypt"},

{EVP_R_BN_DECODE_ERROR                   ,"bn decode error"},

{EVP_R_BN_PUBKEY_ERROR                   ,"bn pubkey error"},

{EVP_R_CIPHER_PARAMETER_ERROR            ,"cipher parameter error"},

{EVP_R_DECODE_ERROR                      ,"decode error"},

{EVP_R_DIFFERENT_KEY_TYPES               ,"different key types"},

{EVP_R_ENCODE_ERROR                      ,"encode error"},
@@ -105,8 +107,12 @@ static ERR_STRING_DATA EVP_str_reasons[]= 
{EVP_R_PUBLIC_KEY_NOT_RSA                ,"public key not rsa"},

{EVP_R_UNKNOWN_PBE_ALGORITHM             ,"unknown pbe algorithm"},

{EVP_R_UNSUPPORTED_CIPHER                ,"unsupported cipher"},

{EVP_R_UNSUPPORTED_KEYLENGTH             ,"unsupported keylength"},

{EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION,"unsupported key derivation function"},

{EVP_R_UNSUPPORTED_KEY_SIZE              ,"unsupported key size"},

{EVP_R_UNSUPPORTED_PRF                   ,"unsupported prf"},

{EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM ,"unsupported private key algorithm"},

{EVP_R_UNSUPPORTED_SALT_TYPE             ,"unsupported salt type"},

{EVP_R_WRONG_FINAL_BLOCK_LENGTH          ,"wrong final block length"},

{EVP_R_WRONG_PUBLIC_KEY_TYPE             ,"wrong public key type"},

{0,NULL}