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

Oops! Remeber to include the other patches this time...

parent 3d8accc3

apps/openssl.cnf

+6 −0
Original line number Diff line number Diff line
@@ -127,7 +127,11 @@ basicConstraints=CA:FALSE 
keyUsage = nonRepudiation, digitalSignature, keyEncipherment



nsComment			= "OpenSSL Generated Certificate"



# PKIX recommendations

subjectKeyIdentifier=hash

authorityKeyIdentifier=keyid,issuer:always





#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem

#nsBaseUrl
@@ -147,6 +151,8 @@ basicConstraints = CA:true 


subjectKeyIdentifier=hash



authorityKeyIdentifier=keyid:always,issuer:always



# This is what PKIX recommends but some broken software chokes on critical

# extensions.

#basicConstraints = critical,CA:true

crypto/asn1/asn1.err

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
#define ASN1_F_D2I_PKCS7_SIGNED				 152

#define ASN1_F_D2I_PKCS7_SIGNER_INFO			 153

#define ASN1_F_D2I_PKCS7_SIGN_ENVELOPE			 154

#define ASN1_F_D2I_PKEY_USAGE_PERIOD			 239

#define ASN1_F_D2I_PRIVATEKEY				 155

#define ASN1_F_D2I_PUBLICKEY				 156

#define ASN1_F_D2I_RSAPRIVATEKEY			 157
@@ -120,6 +121,7 @@ 
#define ASN1_F_PKCS7_SIGNED_NEW				 199

#define ASN1_F_PKCS7_SIGNER_INFO_NEW			 200

#define ASN1_F_PKCS7_SIGN_ENVELOPE_NEW			 201

#define ASN1_F_PKEY_USAGE_PERIOD_NEW			 240

#define ASN1_F_X509_ALGOR_NEW				 202

#define ASN1_F_X509_ATTRIBUTE_NEW			 203

#define ASN1_F_X509_CINF_NEW				 204

crypto/asn1/asn1.h

+2 −0
Original line number Diff line number Diff line
@@ -760,6 +760,7 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(); 
#define ASN1_F_D2I_PKCS7_SIGNED				 152

#define ASN1_F_D2I_PKCS7_SIGNER_INFO			 153

#define ASN1_F_D2I_PKCS7_SIGN_ENVELOPE			 154

#define ASN1_F_D2I_PKEY_USAGE_PERIOD			 239

#define ASN1_F_D2I_PRIVATEKEY				 155

#define ASN1_F_D2I_PUBLICKEY				 156

#define ASN1_F_D2I_RSAPRIVATEKEY			 157
@@ -810,6 +811,7 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(); 
#define ASN1_F_PKCS7_SIGNED_NEW				 199

#define ASN1_F_PKCS7_SIGNER_INFO_NEW			 200

#define ASN1_F_PKCS7_SIGN_ENVELOPE_NEW			 201

#define ASN1_F_PKEY_USAGE_PERIOD_NEW			 240

#define ASN1_F_X509_ALGOR_NEW				 202

#define ASN1_F_X509_ATTRIBUTE_NEW			 203

#define ASN1_F_X509_CINF_NEW				 204

crypto/asn1/asn1_err.c

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_PACK(0,ASN1_F_D2I_PKCS7_SIGNED,0),	"D2I_PKCS7_SIGNED"},

{ERR_PACK(0,ASN1_F_D2I_PKCS7_SIGNER_INFO,0),	"D2I_PKCS7_SIGNER_INFO"},

{ERR_PACK(0,ASN1_F_D2I_PKCS7_SIGN_ENVELOPE,0),	"D2I_PKCS7_SIGN_ENVELOPE"},

{ERR_PACK(0,ASN1_F_D2I_PKEY_USAGE_PERIOD,0),	"D2I_PKEY_USAGE_PERIOD"},

{ERR_PACK(0,ASN1_F_D2I_PRIVATEKEY,0),	"D2I_PRIVATEKEY"},

{ERR_PACK(0,ASN1_F_D2I_PUBLICKEY,0),	"D2I_PUBLICKEY"},

{ERR_PACK(0,ASN1_F_D2I_RSAPRIVATEKEY,0),	"D2I_RSAPRIVATEKEY"},
@@ -182,6 +183,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_PACK(0,ASN1_F_PKCS7_SIGNED_NEW,0),	"PKCS7_SIGNED_NEW"},

{ERR_PACK(0,ASN1_F_PKCS7_SIGNER_INFO_NEW,0),	"PKCS7_SIGNER_INFO_NEW"},

{ERR_PACK(0,ASN1_F_PKCS7_SIGN_ENVELOPE_NEW,0),	"PKCS7_SIGN_ENVELOPE_NEW"},

{ERR_PACK(0,ASN1_F_PKEY_USAGE_PERIOD_NEW,0),	"PKEY_USAGE_PERIOD_NEW"},

{ERR_PACK(0,ASN1_F_X509_ALGOR_NEW,0),	"X509_ALGOR_NEW"},

{ERR_PACK(0,ASN1_F_X509_ATTRIBUTE_NEW,0),	"X509_ATTRIBUTE_NEW"},

{ERR_PACK(0,ASN1_F_X509_CINF_NEW,0),	"X509_CINF_NEW"},

crypto/x509v3/Makefile.ssl

+3 −2
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ APPS= 


LIB=$(TOP)/libcrypto.a

LIBSRC=	v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c \

v3_lib.c v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c

v3_lib.c v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c \

v3_pku.c

LIBOBJ= v3_bcons.o v3_bitst.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o \

v3_prn.o v3_utl.o v3err.o v3_genn.o v3_alt.o v3_skey.o v3_akey.o

v3_prn.o v3_utl.o v3err.o v3_genn.o v3_alt.o v3_skey.o v3_akey.o v3_pku.o



SRC= $(LIBSRC)