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

Add OIDs for idea and blowfish. Unfortunately these are in 

the middle of the OID table so the diff is rather large :-(
parent 6447cce3

CHANGES

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 


 Changes between 0.9.4 and 0.9.5  [xx XXX 1999]



  *) Add OIDs for idea and blowfish in CBC mode. This will allow both

     to be used in PKCS#5 v2.0 and S/MIME.  Also add checking to

     some routines that use cipher OIDs: some ciphers do not have OIDs

     defined and so they cannot be used for S/MIME and PKCS#5 v2.0 for

     example.

     [Steve Henson]



  *) Simplify the trust setting structure and code. Now we just have

     two sequences of OIDs for trusted and rejected settings. These will

     typically have values the same as the extended key usage extension

crypto/asn1/asn1.h

+1 −0
Original line number Diff line number Diff line
@@ -999,6 +999,7 @@ void ASN1_STRING_TABLE_cleanup(void); 
#define ASN1_R_BN_LIB					 107

#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH			 108

#define ASN1_R_BUFFER_TOO_SMALL				 109

#define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER		 166

#define ASN1_R_DATA_IS_WRONG				 110

#define ASN1_R_DECODE_ERROR				 155

#define ASN1_R_DECODING_ERROR				 111

crypto/asn1/asn1_err.c

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ static ERR_STRING_DATA ASN1_str_reasons[]= 
{ASN1_R_BN_LIB                           ,"bn lib"},

{ASN1_R_BOOLEAN_IS_WRONG_LENGTH          ,"boolean is wrong length"},

{ASN1_R_BUFFER_TOO_SMALL                 ,"buffer too small"},

{ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER  ,"cipher has no object identifier"},

{ASN1_R_DATA_IS_WRONG                    ,"data is wrong"},

{ASN1_R_DECODE_ERROR                     ,"decode error"},

{ASN1_R_DECODING_ERROR                   ,"decoding error"},

crypto/asn1/p5_pbev2.c

+10 −3
Original line number Diff line number Diff line
@@ -175,15 +175,22 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, 
	PBKDF2PARAM *kdf = NULL;

	PBE2PARAM *pbe2 = NULL;

	ASN1_OCTET_STRING *osalt = NULL;

	ASN1_OBJECT *obj;



	alg_nid = EVP_CIPHER_type(cipher);

	obj = OBJ_nid2obj(alg_nid);

	if(!obj || !obj->data) {

		ASN1err(ASN1_F_PKCS5_PBE2_SET,

				ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);

		goto err;

	}



	if(!(pbe2 = PBE2PARAM_new())) goto merr;



	/* Setup the AlgorithmIdentifier for the encryption scheme */

	scheme = pbe2->encryption;



	alg_nid = EVP_CIPHER_type(cipher);



	scheme->algorithm = OBJ_nid2obj(alg_nid);

	scheme->algorithm = obj;

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



	/* Create random IV */

crypto/objects/obj_dat.h

+246 −242

File changed.

Preview size limit exceeded, changes collapsed.