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

Fix typos in PKCS#12 ASN1 code.

Make PKCS7_set_detached work again.
parent 3403caf3

crypto/pkcs12/p12_asn.c

+3 −3
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ ASN1_ADB_TEMPLATE(bag_default) = ASN1_EXP(PKCS12_BAGS, value.other, ASN1_ANY, 0) 


ASN1_ADB(PKCS12_BAGS) = {

	ADB_ENTRY(NID_x509Certificate, ASN1_EXP(PKCS12_BAGS, value.x509cert, ASN1_OCTET_STRING, 0)),

	ADB_ENTRY(NID_x509Certificate, ASN1_EXP(PKCS12_BAGS, value.x509crl, ASN1_OCTET_STRING, 0)),

	ADB_ENTRY(NID_x509Certificate, ASN1_EXP(PKCS12_BAGS, value.sdsicert, ASN1_IA5STRING, 0)),

	ADB_ENTRY(NID_x509Crl, ASN1_EXP(PKCS12_BAGS, value.x509crl, ASN1_OCTET_STRING, 0)),

	ADB_ENTRY(NID_sdsiCertificate, ASN1_EXP(PKCS12_BAGS, value.sdsicert, ASN1_IA5STRING, 0)),

} ASN1_ADB_END(PKCS12_BAGS, 0, type, 0, &bag_default_tt, NULL);



ASN1_SEQUENCE(PKCS12_BAGS) = {
@@ -98,7 +98,7 @@ ASN1_ADB_TEMPLATE(safebag_default) = ASN1_EXP(PKCS12_SAFEBAG, value.other, ASN1_ 


ASN1_ADB(PKCS12_SAFEBAG) = {

	ADB_ENTRY(NID_keyBag, ASN1_EXP(PKCS12_SAFEBAG, value.keybag, PKCS8_PRIV_KEY_INFO, 0)),

	ADB_ENTRY(NID_pkcs8ShroudedKeyBag, ASN1_EXP(PKCS12_SAFEBAG, value.keybag, X509_SIG, 0)),

	ADB_ENTRY(NID_pkcs8ShroudedKeyBag, ASN1_EXP(PKCS12_SAFEBAG, value.shkeybag, X509_SIG, 0)),

	ADB_ENTRY(NID_safeContentsBag, ASN1_EXP_SET_OF(PKCS12_SAFEBAG, value.safes, PKCS12_SAFEBAG, 0)),

	ADB_ENTRY(NID_certBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),

	ADB_ENTRY(NID_crlBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),

crypto/pkcs7/pk7_lib.c

+7 −0
Original line number Diff line number Diff line
@@ -74,6 +74,13 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg) 
		if (nid == NID_pkcs7_signed)

			{

			ret=p7->detached=(int)larg;

			if (PKCS7_type_is_data(p7->d.sign->contents))

					{

					ASN1_OCTET_STRING *os;

					os=p7->d.sign->contents->d.data;

					ASN1_OCTET_STRING_free(os);

					p7->d.sign->contents->d.data = NULL;

					}

			}

		else

			{