'make update' (47ddf355) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/Makefile.ssl

+1 −1

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ cversion.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
		cversion.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
		cversion.o: ../include/openssl/stack.h ../include/openssl/symhacks.h buildinf.h
		cversion.o: cryptlib.h cversion.c
		ebcdic.o: ebcdic.c
		ebcdic.o: ../include/openssl/opensslconf.h ebcdic.c
		ex_data.o: ../include/openssl/bio.h ../include/openssl/buffer.h
		ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
		ex_data.o: ../include/openssl/e_os2.h ../include/openssl/err.h

crypto/asn1/asn1.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -1003,6 +1003,8 @@ int ASN1_item_i2d(ASN1_VALUE val, unsigned char out, const ASN1_ITEM it);
		#define ASN1_F_D2I_PKCS7_SIGN_ENVELOPE 209
		#define ASN1_F_D2I_PRIVATEKEY 158
		#define ASN1_F_D2I_PUBLICKEY 159
		#define ASN1_F_D2I_RSAPRIVATEKEY 243
		#define ASN1_F_D2I_RSAPUBLICKEY 244
		#define ASN1_F_D2I_X509 210
		#define ASN1_F_D2I_X509_CINF 211
		#define ASN1_F_D2I_X509_NAME 160
		@@ -1016,6 +1018,8 @@ int ASN1_item_i2d(ASN1_VALUE val, unsigned char out, const ASN1_ITEM it);
		#define ASN1_F_I2D_NETSCAPE_RSA 168
		#define ASN1_F_I2D_PRIVATEKEY 169
		#define ASN1_F_I2D_PUBLICKEY 170
		#define ASN1_F_I2D_RSAPRIVATEKEY 245
		#define ASN1_F_I2D_RSAPUBLICKEY 246
		#define ASN1_F_I2D_RSA_PUBKEY 171
		#define ASN1_F_LONG_C2I 172
		#define ASN1_F_OCSP_BASICRESP_NEW 212

crypto/asn1/asn1_err.c

+35 −31

Original line number	Diff line number	Diff line
		@@ -126,22 +126,22 @@ static ERR_STRING_DATA ASN1_str_functs[]=
		{ERR_PACK(0,ASN1_F_D2I_DSAPRIVATEKEY,0), "d2i_DSAPrivateKey"},
		{ERR_PACK(0,ASN1_F_D2I_DSAPUBLICKEY,0), "d2i_DSAPublicKey"},
		{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_RSA,0), "d2i_Netscape_RSA"},
		{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_RSA_2,0), "d2i_Netscape_RSA_2"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_BASICRESP,0), "d2i_OCSP_BASICRESP"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_CERTID,0), "d2i_OCSP_CERTID"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_CERTSTATUS,0), "d2i_OCSP_CERTSTATUS"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_CRLID,0), "d2i_OCSP_CRLID"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_ONEREQ,0), "d2i_OCSP_ONEREQ"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_REQINFO,0), "d2i_OCSP_REQINFO"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_REQUEST,0), "d2i_OCSP_REQUEST"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPBYTES,0), "d2i_OCSP_RESPBYTES"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPDATA,0), "d2i_OCSP_RESPDATA"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPID,0), "d2i_OCSP_RESPID"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPONSE,0), "d2i_OCSP_RESPONSE"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_REVOKEDINFO,0), "d2i_OCSP_REVOKEDINFO"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_SERVICELOC,0), "d2i_OCSP_SERVICELOC"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_SIGNATURE,0), "d2i_OCSP_SIGNATURE"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_SINGLERESP,0), "d2i_OCSP_SINGLERESP"},
		{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_RSA_2,0), "D2I_NETSCAPE_RSA_2"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_BASICRESP,0), "D2I_OCSP_BASICRESP"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_CERTID,0), "D2I_OCSP_CERTID"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_CERTSTATUS,0), "D2I_OCSP_CERTSTATUS"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_CRLID,0), "D2I_OCSP_CRLID"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_ONEREQ,0), "D2I_OCSP_ONEREQ"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_REQINFO,0), "D2I_OCSP_REQINFO"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_REQUEST,0), "D2I_OCSP_REQUEST"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPBYTES,0), "D2I_OCSP_RESPBYTES"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPDATA,0), "D2I_OCSP_RESPDATA"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPID,0), "D2I_OCSP_RESPID"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPONSE,0), "D2I_OCSP_RESPONSE"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_REVOKEDINFO,0), "D2I_OCSP_REVOKEDINFO"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_SERVICELOC,0), "D2I_OCSP_SERVICELOC"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_SIGNATURE,0), "D2I_OCSP_SIGNATURE"},
		{ERR_PACK(0,ASN1_F_D2I_OCSP_SINGLERESP,0), "D2I_OCSP_SINGLERESP"},
		{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"},
		@@ -158,6 +158,8 @@ static ERR_STRING_DATA ASN1_str_functs[]=
		{ERR_PACK(0,ASN1_F_D2I_PKCS7_SIGN_ENVELOPE,0), "D2I_PKCS7_SIGN_ENVELOPE"},
		{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"},
		{ERR_PACK(0,ASN1_F_D2I_RSAPUBLICKEY,0), "D2I_RSAPUBLICKEY"},
		{ERR_PACK(0,ASN1_F_D2I_X509,0), "D2I_X509"},
		{ERR_PACK(0,ASN1_F_D2I_X509_CINF,0), "D2I_X509_CINF"},
		{ERR_PACK(0,ASN1_F_D2I_X509_NAME,0), "D2I_X509_NAME"},
		@@ -171,23 +173,25 @@ static ERR_STRING_DATA ASN1_str_functs[]=
		{ERR_PACK(0,ASN1_F_I2D_NETSCAPE_RSA,0), "i2d_Netscape_RSA"},
		{ERR_PACK(0,ASN1_F_I2D_PRIVATEKEY,0), "i2d_PrivateKey"},
		{ERR_PACK(0,ASN1_F_I2D_PUBLICKEY,0), "i2d_PublicKey"},
		{ERR_PACK(0,ASN1_F_I2D_RSAPRIVATEKEY,0), "I2D_RSAPRIVATEKEY"},
		{ERR_PACK(0,ASN1_F_I2D_RSAPUBLICKEY,0), "I2D_RSAPUBLICKEY"},
		{ERR_PACK(0,ASN1_F_I2D_RSA_PUBKEY,0), "i2d_RSA_PUBKEY"},
		{ERR_PACK(0,ASN1_F_LONG_C2I,0), "LONG_C2I"},
		{ERR_PACK(0,ASN1_F_OCSP_BASICRESP_NEW,0), "OCSP_BASICRESP_new"},
		{ERR_PACK(0,ASN1_F_OCSP_CERTID_NEW,0), "OCSP_CERTID_new"},
		{ERR_PACK(0,ASN1_F_OCSP_CERTSTATUS_NEW,0), "OCSP_CERTSTATUS_new"},
		{ERR_PACK(0,ASN1_F_OCSP_CRLID_NEW,0), "OCSP_CRLID_new"},
		{ERR_PACK(0,ASN1_F_OCSP_ONEREQ_NEW,0), "OCSP_ONEREQ_new"},
		{ERR_PACK(0,ASN1_F_OCSP_REQINFO_NEW,0), "OCSP_REQINFO_new"},
		{ERR_PACK(0,ASN1_F_OCSP_REQUEST_NEW,0), "OCSP_REQUEST_new"},
		{ERR_PACK(0,ASN1_F_OCSP_RESPBYTES_NEW,0), "OCSP_RESPBYTES_new"},
		{ERR_PACK(0,ASN1_F_OCSP_RESPDATA_NEW,0), "OCSP_RESPDATA_new"},
		{ERR_PACK(0,ASN1_F_OCSP_RESPID_NEW,0), "OCSP_RESPID_new"},
		{ERR_PACK(0,ASN1_F_OCSP_RESPONSE_NEW,0), "OCSP_RESPONSE_new"},
		{ERR_PACK(0,ASN1_F_OCSP_REVOKEDINFO_NEW,0), "OCSP_REVOKEDINFO_new"},
		{ERR_PACK(0,ASN1_F_OCSP_SERVICELOC_NEW,0), "OCSP_SERVICELOC_new"},
		{ERR_PACK(0,ASN1_F_OCSP_SIGNATURE_NEW,0), "OCSP_SIGNATURE_new"},
		{ERR_PACK(0,ASN1_F_OCSP_SINGLERESP_NEW,0), "OCSP_SINGLERESP_new"},
		{ERR_PACK(0,ASN1_F_OCSP_BASICRESP_NEW,0), "OCSP_BASICRESP_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_CERTID_NEW,0), "OCSP_CERTID_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_CERTSTATUS_NEW,0), "OCSP_CERTSTATUS_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_CRLID_NEW,0), "OCSP_crlID_new"},
		{ERR_PACK(0,ASN1_F_OCSP_ONEREQ_NEW,0), "OCSP_ONEREQ_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_REQINFO_NEW,0), "OCSP_REQINFO_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_REQUEST_NEW,0), "OCSP_REQUEST_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_RESPBYTES_NEW,0), "OCSP_RESPBYTES_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_RESPDATA_NEW,0), "OCSP_RESPDATA_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_RESPID_NEW,0), "OCSP_RESPID_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_RESPONSE_NEW,0), "OCSP_RESPONSE_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_REVOKEDINFO_NEW,0), "OCSP_REVOKEDINFO_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_SERVICELOC_NEW,0), "OCSP_SERVICELOC_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_SIGNATURE_NEW,0), "OCSP_SIGNATURE_NEW"},
		{ERR_PACK(0,ASN1_F_OCSP_SINGLERESP_NEW,0), "OCSP_SINGLERESP_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"},

ssl/Makefile.ssl

+3 −25

Original line number	Diff line number	Diff line
		@@ -122,29 +122,7 @@ bio_ssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
		bio_ssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
		bio_ssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
		bio_ssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h bio_ssl.c
		kssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
		kssl.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
		kssl.o: ../include/openssl/buffer.h ../include/openssl/cast.h
		kssl.o: ../include/openssl/comp.h ../include/openssl/crypto.h
		kssl.o: ../include/openssl/des.h ../include/openssl/dh.h
		kssl.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
		kssl.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
		kssl.o: ../include/openssl/idea.h ../include/openssl/lhash.h
		kssl.o: ../include/openssl/md2.h ../include/openssl/md4.h
		kssl.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
		kssl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
		kssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
		kssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
		kssl.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
		kssl.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
		kssl.o: ../include/openssl/rd_fst.h ../include/openssl/rijndael.h
		kssl.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
		kssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
		kssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
		kssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
		kssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
		kssl.o: ../include/openssl/tls1.h ../include/openssl/x509.h
		kssl.o: ../include/openssl/x509_vfy.h kssl.c
		kssl.o: ../include/openssl/opensslconf.h kssl.c
		s23_clnt.o: ../include/openssl/asn1.h ../include/openssl/bio.h
		s23_clnt.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
		s23_clnt.o: ../include/openssl/buffer.h ../include/openssl/cast.h
		@@ -456,7 +434,7 @@ s3_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
		s3_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
		s3_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
		s3_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
		s3_clnt.o: ../include/openssl/x509_vfy.h kssl.h s3_clnt.c ssl_locl.h
		s3_clnt.o: ../include/openssl/x509_vfy.h s3_clnt.c ssl_locl.h
		s3_enc.o: ../include/openssl/asn1.h ../include/openssl/bio.h
		s3_enc.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
		s3_enc.o: ../include/openssl/buffer.h ../include/openssl/cast.h
		@@ -576,7 +554,7 @@ s3_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
		s3_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
		s3_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
		s3_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h
		s3_srvr.o: ../include/openssl/x509_vfy.h kssl.h s3_srvr.c ssl_locl.h
		s3_srvr.o: ../include/openssl/x509_vfy.h s3_srvr.c ssl_locl.h
		ssl_algs.o: ../include/openssl/asn1.h ../include/openssl/bio.h
		ssl_algs.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
		ssl_algs.o: ../include/openssl/buffer.h ../include/openssl/cast.h