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

Various PKCS#12 related tidies and fixes: it might even compile now :-)

parent 8d8c7266

STATUS

+5 −10
Original line number Diff line number Diff line 


  OpenSSL STATUS                           Last modified at

  ______________                           $Date: 1999/03/23 14:48:59 $

  ______________                           $Date: 1999/03/29 00:19:51 $



  DEVELOPMENT STATE
@@ -12,8 +12,6 @@ 


    o Compilation warnings: ctype-related int vs. char

    o Compilation error: "unsigned long*" and "int*" under AIX

    o Why are NULL ciphers in front of the cipher spec?

      (see my posting "Bug?!: Cipher Suite and NULL Ciphers" in openssl-dev)

    o A Linux alpha user reported: "alpha.s does not have bn_div_word()"

      (see posting "ALPHA error" in openssl-dev)

    o Undefined BN symbols in assembler stuff on Solaris
@@ -30,13 +28,10 @@ 


  IN PROGRESS



    o Steve is currently working on:

        X509 V3 extension code including:

        1. Support for the more common PKIX extensions.

        2. Proper (or at least usable) certificate chain verification.

        3. Support in standard applications (req, x509, ca).

        4. Documentation on how all the above works.

        Next on the list is probably PKCS#12 integration.

    o Steve is currently working on (in no particular order):

        PKCS#12 code integration.

        Proper (or at least usable) certificate chain verification.

        Documentation on X509 V3 extension code.



    o Mark is currently working on:

        Folding in any changes that are in the C2Net code base that were

crypto/asn1/asn1.err

+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define ASN1_F_ASN1_INTEGER_TO_BN			 112

#define ASN1_F_ASN1_OBJECT_NEW				 113

#define ASN1_F_ASN1_PACK_STRING				 245

#define ASN1_F_ASN1_PBE_SET				 253

#define ASN1_F_ASN1_SEQ_PACK				 246

#define ASN1_F_ASN1_SEQ_UNPACK				 247

#define ASN1_F_ASN1_SIGN				 114
@@ -65,6 +66,10 @@ 
#define ASN1_F_D2I_NETSCAPE_SPKAC			 143

#define ASN1_F_D2I_NETSCAPE_SPKI			 144

#define ASN1_F_D2I_PBEPARAM				 249

#define ASN1_F_D2I_PKCS12				 254

#define ASN1_F_D2I_PKCS12_BAGS				 255

#define ASN1_F_D2I_PKCS12_MAC_DATA			 256

#define ASN1_F_D2I_PKCS12_SAFEBAG			 257

#define ASN1_F_D2I_PKCS7				 145

#define ASN1_F_D2I_PKCS7_DIGEST				 146

#define ASN1_F_D2I_PKCS7_ENCRYPT			 147
@@ -120,6 +125,10 @@ 
#define ASN1_F_NETSCAPE_SPKAC_NEW			 190

#define ASN1_F_NETSCAPE_SPKI_NEW			 191

#define ASN1_F_PBEPARAM_NEW				 251

#define ASN1_F_PKCS12_BAGS_NEW				 258

#define ASN1_F_PKCS12_MAC_DATA_NEW			 259

#define ASN1_F_PKCS12_NEW				 260

#define ASN1_F_PKCS12_SAFEBAG_NEW			 261

#define ASN1_F_PKCS7_DIGEST_NEW				 192

#define ASN1_F_PKCS7_ENCRYPT_NEW			 193

#define ASN1_F_PKCS7_ENC_CONTENT_NEW			 194

crypto/asn1/asn1.h

+9 −0
Original line number Diff line number Diff line
@@ -725,6 +725,7 @@ ASN1_STRING *ASN1_pack_string(); 
#define ASN1_F_ASN1_INTEGER_TO_BN			 112

#define ASN1_F_ASN1_OBJECT_NEW				 113

#define ASN1_F_ASN1_PACK_STRING				 245

#define ASN1_F_ASN1_PBE_SET				 253

#define ASN1_F_ASN1_SEQ_PACK				 246

#define ASN1_F_ASN1_SEQ_UNPACK				 247

#define ASN1_F_ASN1_SIGN				 114
@@ -770,6 +771,10 @@ ASN1_STRING *ASN1_pack_string(); 
#define ASN1_F_D2I_NETSCAPE_SPKAC			 143

#define ASN1_F_D2I_NETSCAPE_SPKI			 144

#define ASN1_F_D2I_PBEPARAM				 249

#define ASN1_F_D2I_PKCS12				 254

#define ASN1_F_D2I_PKCS12_BAGS				 255

#define ASN1_F_D2I_PKCS12_MAC_DATA			 256

#define ASN1_F_D2I_PKCS12_SAFEBAG			 257

#define ASN1_F_D2I_PKCS7				 145

#define ASN1_F_D2I_PKCS7_DIGEST				 146

#define ASN1_F_D2I_PKCS7_ENCRYPT			 147
@@ -825,6 +830,10 @@ ASN1_STRING *ASN1_pack_string(); 
#define ASN1_F_NETSCAPE_SPKAC_NEW			 190

#define ASN1_F_NETSCAPE_SPKI_NEW			 191

#define ASN1_F_PBEPARAM_NEW				 251

#define ASN1_F_PKCS12_BAGS_NEW				 258

#define ASN1_F_PKCS12_MAC_DATA_NEW			 259

#define ASN1_F_PKCS12_NEW				 260

#define ASN1_F_PKCS12_SAFEBAG_NEW			 261

#define ASN1_F_PKCS7_DIGEST_NEW				 192

#define ASN1_F_PKCS7_ENCRYPT_NEW			 193

#define ASN1_F_PKCS7_ENC_CONTENT_NEW			 194

crypto/asn1/asn1_err.c

+9 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_PACK(0,ASN1_F_ASN1_INTEGER_TO_BN,0),	"ASN1_INTEGER_to_BN"},

{ERR_PACK(0,ASN1_F_ASN1_OBJECT_NEW,0),	"ASN1_OBJECT_new"},

{ERR_PACK(0,ASN1_F_ASN1_PACK_STRING,0),	"ASN1_pack_string"},

{ERR_PACK(0,ASN1_F_ASN1_PBE_SET,0),	"ASN1_PBE_SET"},

{ERR_PACK(0,ASN1_F_ASN1_SEQ_PACK,0),	"ASN1_seq_pack"},

{ERR_PACK(0,ASN1_F_ASN1_SEQ_UNPACK,0),	"ASN1_seq_unpack"},

{ERR_PACK(0,ASN1_F_ASN1_SIGN,0),	"ASN1_SIGN"},
@@ -127,6 +128,10 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_SPKAC,0),	"D2I_NETSCAPE_SPKAC"},

{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_SPKI,0),	"D2I_NETSCAPE_SPKI"},

{ERR_PACK(0,ASN1_F_D2I_PBEPARAM,0),	"D2I_PBEPARAM"},

{ERR_PACK(0,ASN1_F_D2I_PKCS12,0),	"D2I_PKCS12"},

{ERR_PACK(0,ASN1_F_D2I_PKCS12_BAGS,0),	"D2I_PKCS12_BAGS"},

{ERR_PACK(0,ASN1_F_D2I_PKCS12_MAC_DATA,0),	"D2I_PKCS12_MAC_DATA"},

{ERR_PACK(0,ASN1_F_D2I_PKCS12_SAFEBAG,0),	"D2I_PKCS12_SAFEBAG"},

{ERR_PACK(0,ASN1_F_D2I_PKCS7,0),	"D2I_PKCS7"},

{ERR_PACK(0,ASN1_F_D2I_PKCS7_DIGEST,0),	"D2I_PKCS7_DIGEST"},

{ERR_PACK(0,ASN1_F_D2I_PKCS7_ENCRYPT,0),	"D2I_PKCS7_ENCRYPT"},
@@ -182,6 +187,10 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_PACK(0,ASN1_F_NETSCAPE_SPKAC_NEW,0),	"NETSCAPE_SPKAC_NEW"},

{ERR_PACK(0,ASN1_F_NETSCAPE_SPKI_NEW,0),	"NETSCAPE_SPKI_NEW"},

{ERR_PACK(0,ASN1_F_PBEPARAM_NEW,0),	"PBEPARAM_NEW"},

{ERR_PACK(0,ASN1_F_PKCS12_BAGS_NEW,0),	"PKCS12_BAGS_NEW"},

{ERR_PACK(0,ASN1_F_PKCS12_MAC_DATA_NEW,0),	"PKCS12_MAC_DATA_NEW"},

{ERR_PACK(0,ASN1_F_PKCS12_NEW,0),	"PKCS12_NEW"},

{ERR_PACK(0,ASN1_F_PKCS12_SAFEBAG_NEW,0),	"PKCS12_SAFEBAG_NEW"},

{ERR_PACK(0,ASN1_F_PKCS7_DIGEST_NEW,0),	"PKCS7_DIGEST_NEW"},

{ERR_PACK(0,ASN1_F_PKCS7_ENCRYPT_NEW,0),	"PKCS7_ENCRYPT_NEW"},

{ERR_PACK(0,ASN1_F_PKCS7_ENC_CONTENT_NEW,0),	"PKCS7_ENC_CONTENT_NEW"},

crypto/err/err.c

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static ERR_STRING_DATA ERR_str_libraries[]= 
{ERR_PACK(ERR_LIB_BIO,0,0)		,"BIO routines"},

{ERR_PACK(ERR_LIB_PKCS7,0,0)		,"PKCS7 routines"},

{ERR_PACK(ERR_LIB_X509V3,0,0)		,"X509 V3 routines"},

{ERR_PACK(ERR_LIB_PKCS12,0,0)		,"PKCS12 routines"},

{0,NULL},

	};
@@ -148,6 +149,7 @@ static ERR_STRING_DATA ERR_str_reasons[]= 
{ERR_R_PROXY_LIB			,"PROXY lib"},

{ERR_R_BIO_LIB				,"BIO lib"},

{ERR_R_PKCS7_LIB			,"PKCS7 lib"},

{ERR_R_PKCS12_LIB			,"PKCS12 lib"},

{ERR_R_MALLOC_FAILURE			,"Malloc failure"},

{ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED	,"called a fuction you should not call"},

{ERR_R_PASSED_NULL_PARAMETER		,"passed a null parameter"},