Backport of password based CMS support from HEAD. (dc100d87) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+10 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,16 @@

		Changes between 1.0.0e and 1.0.1 [xx XXX xxxx]

		*) Experiemental password based recipient info support for CMS library:
		implementing RFC3211.
		[Steve Henson]

		*) Split password based encryption into PBES2 and PBKDF2 functions. This
		neatly separates the code into cipher and PBE sections and is required
		for some algorithms that split PBES2 into separate pieces (such as
		password based CMS).
		[Steve Henson]

		*) Session-handling fixes:
		- Fix handling of connections that are resuming with a session ID,
		but also support Session Tickets.

apps/cms.c

+33 −2

Original line number	Diff line number	Diff line
		@@ -136,6 +136,7 @@ int MAIN(int argc, char **argv)
		char *engine=NULL;
		#endif
		unsigned char secret_key = NULL, secret_keyid = NULL;
		unsigned char pwri_pass = NULL, pwri_tmp = NULL;
		size_t secret_keylen = 0, secret_keyidlen = 0;

		ASN1_OBJECT *econtent_type = NULL;
		@@ -326,6 +327,13 @@ int MAIN(int argc, char **argv)
		}
		secret_keyidlen = (size_t)ltmp;
		}
		else if (!strcmp(*args,"-pwri_password"))
		{
		if (!args[1])
		goto argerr;
		args++;
		pwri_pass = (unsigned char )args;
		}
		else if (!strcmp(*args,"-econtent_type"))
		{
		if (!args[1])
		@@ -559,7 +567,7 @@ int MAIN(int argc, char **argv)

		else if (operation == SMIME_DECRYPT)
		{
		if (!recipfile && !keyfile && !secret_key)
		if (!recipfile && !keyfile && !secret_key && !pwri_pass)
		{
		BIO_printf(bio_err, "No recipient certificate or key specified\n");
		badarg = 1;
		@@ -567,7 +575,7 @@ int MAIN(int argc, char **argv)
		}
		else if (operation == SMIME_ENCRYPT)
		{
		if (!*args && !secret_key)
		if (!*args && !secret_key && !pwri_pass)
		{
		BIO_printf(bio_err, "No recipient(s) certificate(s) specified\n");
		badarg = 1;
		@@ -917,6 +925,17 @@ int MAIN(int argc, char **argv)
		secret_key = NULL;
		secret_keyid = NULL;
		}
		if (pwri_pass)
		{
		pwri_tmp = (unsigned char )BUF_strdup((char )pwri_pass);
		if (!pwri_tmp)
		goto end;
		if (!CMS_add0_recipient_password(cms,
		-1, NID_undef, NID_undef,
		pwri_tmp, -1, NULL))
		goto end;
		pwri_tmp = NULL;
		}
		if (!(flags & CMS_STREAM))
		{
		if (!CMS_final(cms, in, NULL, flags))
		@@ -1043,6 +1062,16 @@ int MAIN(int argc, char **argv)
		}
		}

		if (pwri_pass)
		{
		if (!CMS_decrypt_set1_password(cms, pwri_pass, -1))
		{
		BIO_puts(bio_err,
		"Error decrypting CMS using password\n");
		goto end;
		}
		}

		if (!CMS_decrypt(cms, NULL, NULL, indata, out, flags))
		{
		BIO_printf(bio_err, "Error decrypting CMS structure\n");
		@@ -1167,6 +1196,8 @@ end:
		OPENSSL_free(secret_key);
		if (secret_keyid)
		OPENSSL_free(secret_keyid);
		if (pwri_tmp)
		OPENSSL_free(pwri_tmp);
		if (econtent_type)
		ASN1_OBJECT_free(econtent_type);
		if (rr)

crypto/asn1/asn1.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -1266,6 +1266,7 @@ void ERR_load_ASN1_strings(void);
		#define ASN1_F_PKCS5_PBE2_SET_IV 167
		#define ASN1_F_PKCS5_PBE_SET 202
		#define ASN1_F_PKCS5_PBE_SET0_ALGOR 215
		#define ASN1_F_PKCS5_PBKDF2_SET 219
		#define ASN1_F_SMIME_READ_ASN1 212
		#define ASN1_F_SMIME_TEXT 213
		#define ASN1_F_X509_CINF_NEW 168

crypto/asn1/asn1_err.c

+2 −1

Original line number	Diff line number	Diff line
		/* crypto/asn1/asn1_err.c */
		/* ====================================================================
		* Copyright (c) 1999-2009 The OpenSSL Project. All rights reserved.
		* Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		@@ -179,6 +179,7 @@ static ERR_STRING_DATA ASN1_str_functs[]=
		{ERR_FUNC(ASN1_F_PKCS5_PBE2_SET_IV), "PKCS5_pbe2_set_iv"},
		{ERR_FUNC(ASN1_F_PKCS5_PBE_SET), "PKCS5_pbe_set"},
		{ERR_FUNC(ASN1_F_PKCS5_PBE_SET0_ALGOR), "PKCS5_pbe_set0_algor"},
		{ERR_FUNC(ASN1_F_PKCS5_PBKDF2_SET), "PKCS5_pbkdf2_set"},
		{ERR_FUNC(ASN1_F_SMIME_READ_ASN1), "SMIME_read_ASN1"},
		{ERR_FUNC(ASN1_F_SMIME_TEXT), "SMIME_text"},
		{ERR_FUNC(ASN1_F_X509_CINF_NEW), "X509_CINF_NEW"},

crypto/asn1/p5_pbev2.c

+91 −49

Original line number	Diff line number	Diff line
		@@ -91,12 +91,10 @@ X509_ALGOR PKCS5_pbe2_set_iv(const EVP_CIPHER cipher, int iter,
		unsigned char *aiv, int prf_nid)
		{
		X509_ALGOR scheme = NULL, kalg = NULL, *ret = NULL;
		int alg_nid;
		int alg_nid, keylen;
		EVP_CIPHER_CTX ctx;
		unsigned char iv[EVP_MAX_IV_LENGTH];
		PBKDF2PARAM *kdf = NULL;
		PBE2PARAM *pbe2 = NULL;
		ASN1_OCTET_STRING *osalt = NULL;
		ASN1_OBJECT *obj;

		alg_nid = EVP_CIPHER_type(cipher);
		@@ -146,55 +144,19 @@ X509_ALGOR PKCS5_pbe2_set_iv(const EVP_CIPHER cipher, int iter,
		}
		EVP_CIPHER_CTX_cleanup(&ctx);

		if(!(kdf = PBKDF2PARAM_new())) goto merr;
		if(!(osalt = M_ASN1_OCTET_STRING_new())) goto merr;

		if (!saltlen) saltlen = PKCS5_SALT_LEN;
		if (!(osalt->data = OPENSSL_malloc (saltlen))) goto merr;
		osalt->length = saltlen;
		if (salt) memcpy (osalt->data, salt, saltlen);
		else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0) goto merr;

		if(iter <= 0) iter = PKCS5_DEFAULT_ITER;
		if(!ASN1_INTEGER_set(kdf->iter, iter)) goto merr;

		/* Now include salt in kdf structure */
		kdf->salt->value.octet_string = osalt;
		kdf->salt->type = V_ASN1_OCTET_STRING;
		osalt = NULL;

		/* If its RC2 then we'd better setup the key length */

		if(alg_nid == NID_rc2_cbc) {
		if(!(kdf->keylength = M_ASN1_INTEGER_new())) goto merr;
		if(!ASN1_INTEGER_set (kdf->keylength,
		EVP_CIPHER_key_length(cipher))) goto merr;
		}

		/* prf can stay NULL if we are using hmacWithSHA1 */
		if (prf_nid != NID_hmacWithSHA1)
		{
		kdf->prf = X509_ALGOR_new();
		if (!kdf->prf)
		goto merr;
		X509_ALGOR_set0(kdf->prf, OBJ_nid2obj(prf_nid),
		V_ASN1_NULL, NULL);
		}

		/* Now setup the PBE2PARAM keyfunc structure */
		if(alg_nid == NID_rc2_cbc)
		keylen = EVP_CIPHER_key_length(cipher);
		else
		keylen = -1;

		pbe2->keyfunc->algorithm = OBJ_nid2obj(NID_id_pbkdf2);
		/* Setup keyfunc */

		/* Encode PBKDF2PARAM into parameter of pbe2 */

		if(!(pbe2->keyfunc->parameter = ASN1_TYPE_new())) goto merr;
		pbe2->keyfunc = PKCS5_pbkdf2_set(iter, salt, saltlen, prf_nid, keylen);

		if(!ASN1_item_pack(kdf, ASN1_ITEM_rptr(PBKDF2PARAM),
		&pbe2->keyfunc->parameter->value.sequence)) goto merr;
		pbe2->keyfunc->parameter->type = V_ASN1_SEQUENCE;

		PBKDF2PARAM_free(kdf);
		kdf = NULL;
		if (!pbe2->keyfunc)
		goto merr;

		/* Now set up top level AlgorithmIdentifier */

		@@ -220,8 +182,6 @@ X509_ALGOR PKCS5_pbe2_set_iv(const EVP_CIPHER cipher, int iter,
		err:
		PBE2PARAM_free(pbe2);
		/* Note 'scheme' is freed as part of pbe2 */
		M_ASN1_OCTET_STRING_free(osalt);
		PBKDF2PARAM_free(kdf);
		X509_ALGOR_free(kalg);
		X509_ALGOR_free(ret);

		@@ -234,3 +194,85 @@ X509_ALGOR PKCS5_pbe2_set(const EVP_CIPHER cipher, int iter,
		{
		return PKCS5_pbe2_set_iv(cipher, iter, salt, saltlen, NULL, -1);
		}

		X509_ALGOR PKCS5_pbkdf2_set(int iter, unsigned char salt, int saltlen,
		int prf_nid, int keylen)
		{
		X509_ALGOR *keyfunc = NULL;
		PBKDF2PARAM *kdf = NULL;
		ASN1_OCTET_STRING *osalt = NULL;

		if(!(kdf = PBKDF2PARAM_new()))
		goto merr;
		if(!(osalt = M_ASN1_OCTET_STRING_new()))
		goto merr;

		kdf->salt->value.octet_string = osalt;
		kdf->salt->type = V_ASN1_OCTET_STRING;

		if (!saltlen)
		saltlen = PKCS5_SALT_LEN;
		if (!(osalt->data = OPENSSL_malloc (saltlen)))
		goto merr;

		osalt->length = saltlen;

		if (salt)
		memcpy (osalt->data, salt, saltlen);
		else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0)
		goto merr;

		if(iter <= 0)
		iter = PKCS5_DEFAULT_ITER;

		if(!ASN1_INTEGER_set(kdf->iter, iter))
		goto merr;

		/* If have a key len set it up */

		if(keylen > 0)
		{
		if(!(kdf->keylength = M_ASN1_INTEGER_new()))
		goto merr;
		if(!ASN1_INTEGER_set (kdf->keylength, keylen))
		goto merr;
		}

		/* prf can stay NULL if we are using hmacWithSHA1 */
		if (prf_nid > 0 && prf_nid != NID_hmacWithSHA1)
		{
		kdf->prf = X509_ALGOR_new();
		if (!kdf->prf)
		goto merr;
		X509_ALGOR_set0(kdf->prf, OBJ_nid2obj(prf_nid),
		V_ASN1_NULL, NULL);
		}

		/* Finally setup the keyfunc structure */

		keyfunc = X509_ALGOR_new();
		if (!keyfunc)
		goto merr;

		keyfunc->algorithm = OBJ_nid2obj(NID_id_pbkdf2);

		/* Encode PBKDF2PARAM into parameter of pbe2 */

		if(!(keyfunc->parameter = ASN1_TYPE_new()))
		goto merr;

		if(!ASN1_item_pack(kdf, ASN1_ITEM_rptr(PBKDF2PARAM),
		&keyfunc->parameter->value.sequence))
		goto merr;
		keyfunc->parameter->type = V_ASN1_SEQUENCE;

		PBKDF2PARAM_free(kdf);
		return keyfunc;

		merr:
		ASN1err(ASN1_F_PKCS5_PBKDF2_SET,ERR_R_MALLOC_FAILURE);
		PBKDF2PARAM_free(kdf);
		X509_ALGOR_free(keyfunc);
		return NULL;
		}