Add i2d_ASN1_PRINTABLESTRING() function, and do 'make update' (a2121e0a) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/Makefile.ssl

+17 −0

Original line number	Diff line number	Diff line
		@@ -689,6 +689,23 @@ sess_id.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
		sess_id.o: ../include/openssl/stack.h ../include/openssl/tls1.h
		sess_id.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
		sess_id.o: progs.h
		smime.o: ../include/openssl/asn1.h ../include/openssl/bio.h
		smime.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
		smime.o: ../include/openssl/buffer.h ../include/openssl/cast.h
		smime.o: ../include/openssl/crypto.h ../include/openssl/des.h
		smime.o: ../include/openssl/dh.h ../include/openssl/dsa.h
		smime.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
		smime.o: ../include/openssl/err.h ../include/openssl/evp.h
		smime.o: ../include/openssl/idea.h ../include/openssl/md2.h
		smime.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
		smime.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
		smime.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
		smime.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
		smime.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
		smime.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
		smime.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
		smime.o: ../include/openssl/sha.h ../include/openssl/stack.h
		smime.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h progs.h
		speed.o: ../include/openssl/asn1.h ../include/openssl/bio.h
		speed.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
		speed.o: ../include/openssl/buffer.h ../include/openssl/cast.h

crypto/asn1/a_print.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,9 @@ ASN1_PRINTABLESTRING d2i_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING *a,
		{ return(M_d2i_ASN1_PRINTABLESTRING(a,pp,
		l)); }

		int i2d_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING a, unsigned char *pp)
		{ return(M_i2d_ASN1_PRINTABLESTRING(a,pp)); }

		int i2d_ASN1_PRINTABLE(ASN1_STRING a, unsigned char *pp)
		{ return(M_i2d_ASN1_PRINTABLE(a,pp)); }

crypto/asn1/asn1.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -617,6 +617,7 @@ ASN1_PRINTABLESTRING * ASN1_PRINTABLESTRING_new(void);
		void ASN1_PRINTABLESTRING_free(ASN1_PRINTABLESTRING *a);
		ASN1_PRINTABLESTRING d2i_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING *a,
		unsigned char **pp, long l);
		int i2d_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING a, unsigned char *pp);

		ASN1_STRING * DIRECTORYSTRING_new(void);
		void DIRECTORYSTRING_free(ASN1_STRING *a);

crypto/pkcs7/Makefile.ssl

+60 −6

Original line number	Diff line number	Diff line
		@@ -97,14 +97,31 @@ clean:

		# DO NOT DELETE THIS LINE -- make depend depends on it.

		pk7_attr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
		pk7_attr.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
		pk7_attr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
		pk7_attr.o: ../../include/openssl/des.h ../../include/openssl/dh.h
		pk7_attr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
		pk7_attr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
		pk7_attr.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
		pk7_attr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
		pk7_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
		pk7_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
		pk7_attr.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
		pk7_attr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
		pk7_attr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
		pk7_attr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
		pk7_attr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
		pk7_attr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
		pk7_doit.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
		pk7_doit.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
		pk7_doit.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
		pk7_doit.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
		pk7_doit.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
		pk7_doit.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
		pk7_doit.o: ../../include/openssl/err.h ../../include/openssl/evp.h
		pk7_doit.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
		pk7_doit.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
		pk7_doit.o: ../../include/openssl/des.h ../../include/openssl/dh.h
		pk7_doit.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
		pk7_doit.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		pk7_doit.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
		pk7_doit.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
		pk7_doit.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
		pk7_doit.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
		pk7_doit.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
		@@ -113,7 +130,8 @@ pk7_doit.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
		pk7_doit.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
		pk7_doit.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
		pk7_doit.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
		pk7_doit.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
		pk7_doit.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
		pk7_doit.o: ../cryptlib.h
		pk7_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
		pk7_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
		pk7_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
		@@ -131,6 +149,42 @@ pk7_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
		pk7_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
		pk7_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
		pk7_lib.o: ../cryptlib.h
		pk7_mime.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
		pk7_mime.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
		pk7_mime.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
		pk7_mime.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
		pk7_mime.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
		pk7_mime.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
		pk7_mime.o: ../../include/openssl/err.h ../../include/openssl/evp.h
		pk7_mime.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
		pk7_mime.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
		pk7_mime.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
		pk7_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
		pk7_mime.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
		pk7_mime.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
		pk7_mime.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
		pk7_mime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
		pk7_mime.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
		pk7_mime.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
		pk7_smime.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
		pk7_smime.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
		pk7_smime.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
		pk7_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
		pk7_smime.o: ../../include/openssl/des.h ../../include/openssl/dh.h
		pk7_smime.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
		pk7_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		pk7_smime.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
		pk7_smime.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
		pk7_smime.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
		pk7_smime.o: ../../include/openssl/objects.h
		pk7_smime.o: ../../include/openssl/opensslconf.h
		pk7_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
		pk7_smime.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
		pk7_smime.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
		pk7_smime.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
		pk7_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
		pk7_smime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
		pk7_smime.o: ../../include/openssl/x509v3.h ../cryptlib.h
		pkcs7err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
		pkcs7err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
		pkcs7err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h

util/libeay.num

+15 −0

Original line number	Diff line number	Diff line
		@@ -2114,3 +2114,18 @@ sk_ASN1_STRING_TABLE_new 2138
		sk_X509_TRUST_delete 2139
		X509_add_trust_object 2140
		PKCS12_newpass 2141
		SMIME_write_PKCS7 2142
		SMIME_read_PKCS7 2143
		des_set_key_checked 2144
		PKCS7_verify 2145
		PKCS7_encrypt 2146
		des_set_key_unchecked 2147
		SMIME_crlf_copy 2148
		i2d_ASN1_PRINTABLESTRING 2149
		PKCS7_iget_signers 2150
		PKCS7_decrypt 2151
		SMIME_text 2152
		PKCS7_simple_smimecap 2153
		PKCS7_get_smimecap 2154
		PKCS7_sign 2155
		PKCS7_add_attrib_smimecap 2156