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

Remove deleted PKCS#12 functions from pkcs12.h, get rid of object creation 

kludge, remove CRs from ssl_ciph.c and update Win32 functions for PKCS#12
code. It might compile under Win32 now ...
parent ee0508d4

crypto/pkcs12/p12_add.c

+7 −9
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int nid2; 
		PKCS12err(PKCS12_F_PKCS12_PACK_SAFEBAG, ERR_R_MALLOC_FAILURE);

		return NULL;

	}

	M_ASN1_OBJECT_set(bag->type, nid1);

	bag->type = OBJ_nid2obj(nid1);

	if (!ASN1_pack_string(obj, i2d, &bag->value.octet)) {

		PKCS12err(PKCS12_F_PKCS12_PACK_SAFEBAG, ERR_R_MALLOC_FAILURE);

		return NULL;
@@ -85,7 +85,7 @@ int nid2; 
		return NULL;

	}

	safebag->value.bag = bag;

	M_ASN1_OBJECT_set(safebag->type, nid2);

	safebag->type = OBJ_nid2obj(nid2);

	return safebag;

}
@@ -99,7 +99,7 @@ PKCS8_PRIV_KEY_INFO *p8; 
		PKCS12err(PKCS12_F_PKCS12_MAKE_SAFEBAG, ERR_R_MALLOC_FAILURE);

		return NULL;

	}

	M_ASN1_OBJECT_set(bag->type, NID_keyBag);

	bag->type = OBJ_nid2obj(NID_keyBag);

	bag->value.keybag = p8;

	return bag;

}
@@ -123,7 +123,7 @@ PKCS8_PRIV_KEY_INFO *p8; 
		return NULL;

	}



	M_ASN1_OBJECT_set(bag->type, NID_pkcs8ShroudedKeyBag);

	bag->type = OBJ_nid2obj(NID_pkcs8ShroudedKeyBag);

	if (!(bag->value.shkeybag = 

	  PKCS8_encrypt(pbe_nid, pass, passlen, salt, saltlen, iter, p8))) {

		PKCS12err(PKCS12_F_PKCS12_MAKE_SHKEYBAG, ERR_R_MALLOC_FAILURE);
@@ -142,7 +142,7 @@ STACK *sk; 
		PKCS12err(PKCS12_F_PKCS12_PACK_P7_DATA, ERR_R_MALLOC_FAILURE);

		return NULL;

	}

	M_ASN1_OBJECT_set(p7->type, NID_pkcs7_data);

	p7->type = OBJ_nid2obj(NID_pkcs7_data);

	if (!(p7->d.data = ASN1_OCTET_STRING_new())) {

		PKCS12err(PKCS12_F_PKCS12_PACK_P7_DATA, ERR_R_MALLOC_FAILURE);

		return NULL;
@@ -174,15 +174,13 @@ STACK *bags; 
		PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);

		return NULL;

	}

	/* The next bit may end up in PKCS7_set_type eventually */

	M_ASN1_OBJECT_set(p7->type, NID_pkcs7_encrypted);

	p7->type = OBJ_nid2obj(NID_pkcs7_encrypted);

	if (!(p7->d.encrypted = PKCS7_ENCRYPT_new ())) {

		PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);

		return NULL;

	}

	ASN1_INTEGER_set (p7->d.encrypted->version, 0);

	M_ASN1_OBJECT_set(p7->d.encrypted->enc_data->content_type,

								NID_pkcs7_data);

	p7->d.encrypted->enc_data->content_type = OBJ_nid2obj(NID_pkcs7_data);

	if (!(pbe = PKCS5_pbe_set (pbe_nid, iter, salt, saltlen))) {

		PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);

		return NULL;

crypto/pkcs12/p12_attr.c

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ int namelen; 
		PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);

		return 0;

	}

	M_ASN1_OBJECT_set(attrib->object, NID_localKeyID);

	attrib->object = OBJ_nid2obj(NID_localKeyID);

	if (!(attrib->value.set = sk_new(NULL))) {

		PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);

		return 0;
@@ -132,7 +132,7 @@ int usage; 
		PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);

		return 0;

	}

	M_ASN1_OBJECT_set(attrib->object, NID_key_usage);

	attrib->object = OBJ_nid2obj(NID_key_usage);

	if (!(attrib->value.set = sk_new(NULL))) {

		PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);

		return 0;
@@ -196,7 +196,7 @@ int namelen; 
		PKCS12err(PKCS12_F_ADD_FRIENDLYNAME_UNI,ERR_R_MALLOC_FAILURE);

		return 0;

	}

	M_ASN1_OBJECT_set(attrib->object, NID_friendlyName);

	attrib->object = OBJ_nid2obj(NID_friendlyName);

	if (!(attrib->value.set = sk_new(NULL))) {

		PKCS12err(PKCS12_F_ADD_FRIENDLYNAME,ERR_R_MALLOC_FAILURE);

		return 0;

crypto/pkcs12/p12_init.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ int mode; 
		PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);

		return NULL;

	}

	M_ASN1_OBJECT_set(pkcs12->authsafes->type, mode);

	pkcs12->authsafes->type = OBJ_nid2obj(mode);

	switch (mode) {

		case NID_pkcs7_data:

			if (!(pkcs12->authsafes->d.data =

crypto/pkcs12/p12_mutl.c

+1 −2
Original line number Diff line number Diff line
@@ -173,8 +173,7 @@ EVP_MD *md_type; 
	}

	if (!salt) RAND_bytes (p12->mac->salt->data, saltlen);

	else memcpy (p12->mac->salt->data, salt, saltlen);

	M_ASN1_OBJECT_set(p12->mac->dinfo->algor->algorithm,

							 EVP_MD_type(md_type));

	p12->mac->dinfo->algor->algorithm = OBJ_nid2obj(EVP_MD_type(md_type));

	if (!(p12->mac->dinfo->algor->parameter = ASN1_TYPE_new())) {

		PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);

		return 0;

crypto/pkcs12/p12_utl.c

+0 −11
Original line number Diff line number Diff line
@@ -95,17 +95,6 @@ int unilen; 
	return asctmp;

}



/* Tag an object type onto an error code */



void PKCS12_add_obj_error (obj)

ASN1_OBJECT *obj;

{

	char obj_tmp[80];

	if (!obj) strcpy (obj_tmp, "NULL");

	else i2t_ASN1_OBJECT(obj_tmp, 80, obj);

	ERR_add_error_data(2, "TYPE=", obj_tmp);

}



int i2d_PKCS12_bio(bp, p12)

BIO *bp;

PKCS12 *p12;