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

Make -CSP option work again in pkcs12 utility by checking for 

attribute in EVP_PKEY structure.
parent 8ccd06c6

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 0.9.7h and 0.9.8  [xx XXX xxxx]



  *) Add attribute functions to EVP_PKEY structure. Modify

     PKCS12_create() to recognize a CSP name attribute and

     use it. Make -CSP option work again in pkcs12 utility.

     [Steve Henson]



  *) Add new functionality to the bn blinding code:

     - automatic re-creation of the BN_BLINDING parameters after

       a fixed number of uses (currently 32)

apps/pkcs12.c

+4 −0
Original line number Diff line number Diff line
@@ -539,6 +539,10 @@ int MAIN(int argc, char **argv) 
		X509_alias_set1(sk_X509_value(certs, i), catmp, -1);

		}



	if (csp_name && key)

		EVP_PKEY_add1_attr_by_NID(key, NID_ms_csp_name,

				MBSTRING_ASC, (unsigned char *)csp_name, -1);

		



#ifdef CRYPTO_MDEBUG

	CRYPTO_pop_info();

crypto/evp/evp.h

+1 −0
Original line number Diff line number Diff line
@@ -795,6 +795,7 @@ struct ec_key_st *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey); 


EVP_PKEY *	EVP_PKEY_new(void);

void		EVP_PKEY_free(EVP_PKEY *pkey);



EVP_PKEY *	d2i_PublicKey(int type,EVP_PKEY **a, const unsigned char **pp,

			long length);

int		i2d_PublicKey(EVP_PKEY *a, unsigned char **pp);

crypto/evp/evp_pkey.c

+62 −0
Original line number Diff line number Diff line
@@ -709,3 +709,65 @@ static int eckey_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey) 
	return ret;

}

#endif



/* EVP_PKEY attribute functions */



int EVP_PKEY_get_attr_count(const EVP_PKEY *key)

{

	return X509at_get_attr_count(key->attributes);

}



int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid,

			  int lastpos)

{

	return X509at_get_attr_by_NID(key->attributes, nid, lastpos);

}



int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, ASN1_OBJECT *obj,

			  int lastpos)

{

	return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos);

}



X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc)

{

	return X509at_get_attr(key->attributes, loc);

}



X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc)

{

	return X509at_delete_attr(key->attributes, loc);

}



int EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr)

{

	if(X509at_add1_attr(&key->attributes, attr)) return 1;

	return 0;

}



int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key,

			const ASN1_OBJECT *obj, int type,

			const unsigned char *bytes, int len)

{

	if(X509at_add1_attr_by_OBJ(&key->attributes, obj,

				type, bytes, len)) return 1;

	return 0;

}



int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key,

			int nid, int type,

			const unsigned char *bytes, int len)

{

	if(X509at_add1_attr_by_NID(&key->attributes, nid,

				type, bytes, len)) return 1;

	return 0;

}



int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key,

			const char *attrname, int type,

			const unsigned char *bytes, int len)

{

	if(X509at_add1_attr_by_txt(&key->attributes, attrname,

				type, bytes, len)) return 1;

	return 0;

}

crypto/evp/p_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -451,6 +451,8 @@ void EVP_PKEY_free(EVP_PKEY *x) 
		}

#endif

	EVP_PKEY_free_it(x);

	if (x->attributes)

		sk_X509_ATTRIBUTE_pop_free(x->attributes, X509_ATTRIBUTE_free);

	OPENSSL_free(x);

	}