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

Add information and pem strings. Update dependencies.

parent 18e377b4

crypto/asn1/Makefile

+23 −9
Original line number Diff line number Diff line
@@ -279,7 +279,8 @@ a_type.o: ../../e_os.h ../../include/openssl/asn1.h 
a_type.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h

a_type.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

a_type.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

a_type.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h

a_type.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

a_type.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

a_type.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

a_type.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

a_type.o: ../../include/openssl/symhacks.h ../cryptlib.h a_type.c
@@ -311,6 +312,21 @@ a_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h 
a_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

a_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

a_verify.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_verify.c

ameth_lib.o: ../../e_os.h ../../include/openssl/asn1.h

ameth_lib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h

ameth_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

ameth_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

ameth_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h

ameth_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h

ameth_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

ameth_lib.o: ../../include/openssl/objects.h

ameth_lib.o: ../../include/openssl/opensslconf.h

ameth_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

ameth_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h

ameth_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

ameth_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

ameth_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ameth_lib.c

ameth_lib.o: asn1_locl.h

asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

asn1_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

asn1_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
@@ -542,13 +558,11 @@ t_crl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 
t_crl.o: ../cryptlib.h t_crl.c

t_pkey.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h

t_pkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

t_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h

t_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

t_pkey.o: ../../include/openssl/ec.h ../../include/openssl/err.h

t_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

t_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

t_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

t_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

t_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

t_pkey.o: ../../include/openssl/err.h ../../include/openssl/lhash.h

t_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

t_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

t_pkey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h

t_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

t_pkey.o: ../cryptlib.h t_pkey.c

t_req.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -802,7 +816,7 @@ x_pubkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h 
x_pubkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

x_pubkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

x_pubkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

x_pubkey.o: ../cryptlib.h x_pubkey.c

x_pubkey.o: ../cryptlib.h asn1_locl.h x_pubkey.c

x_req.o: ../../e_os.h ../../include/openssl/asn1.h

x_req.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h

x_req.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

crypto/asn1/ameth_lib.c

+34 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ int EVP_PKEY_asn1_add(const EVP_PKEY_ASN1_METHOD *ameth) 
	return 1;

	}



EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id)

EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id,

					const char *pem_str, const char *info)

	{

	EVP_PKEY_ASN1_METHOD *ameth;

	ameth = OPENSSL_malloc(sizeof(EVP_PKEY_ASN1_METHOD));
@@ -154,6 +155,20 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id) 
	ameth->pkey_base_id = id;

	ameth->pkey_flags = ASN1_PKEY_DYNAMIC;



	if (info)

		{

		ameth->info = BUF_strdup(info);

		if (!ameth->info)

			goto err;

		}



	if (pem_str)

		{

		ameth->pem_str = BUF_strdup(pem_str);

		if (!ameth->pem_str)

			goto err;

		}

	

	ameth->pub_decode = 0;

	ameth->pub_encode = 0;

	ameth->pub_cmp = 0;
@@ -180,6 +195,24 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id) 
	ameth->pkey_ctrl = 0;



	return ameth;



	err:



	EVP_PKEY_asn1_free(ameth);

	return NULL;



	}



void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)

	{

	if (ameth && (ameth->pkey_flags & ASN1_PKEY_DYNAMIC))

		{

		if (ameth->pem_str)

			OPENSSL_free(ameth->pem_str);

		if (ameth->info)

			OPENSSL_free(ameth->info);

		OPENSSL_free(ameth);

		}

	}



void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,

crypto/asn1/asn1_locl.h

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ struct evp_pkey_asn1_method_st 
	int pkey_base_id;

	unsigned long pkey_flags;



	char *pem_str;

	char *info;



	int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub);

	int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk);

	int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);

crypto/dh/Makefile

+23 −0
Original line number Diff line number Diff line
@@ -76,6 +76,20 @@ clean: 


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



dh_ameth.o: ../../e_os.h ../../include/openssl/asn1.h

dh_ameth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h

dh_ameth.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h

dh_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

dh_ameth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h

dh_ameth.o: ../../include/openssl/err.h ../../include/openssl/evp.h

dh_ameth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

dh_ameth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

dh_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

dh_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h

dh_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

dh_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

dh_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h

dh_ameth.o: dh_ameth.c

dh_asn1.o: ../../e_os.h ../../include/openssl/asn1.h

dh_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h

dh_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -133,3 +147,12 @@ dh_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 
dh_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

dh_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_lib.c

dh_prn.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h

dh_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

dh_prn.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h

dh_prn.o: ../../include/openssl/err.h ../../include/openssl/evp.h

dh_prn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

dh_prn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

dh_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

dh_prn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

dh_prn.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_prn.c

crypto/dh/dh_ameth.c

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ const EVP_PKEY_ASN1_METHOD dh_asn1_meth = 
	EVP_PKEY_DH,

	0,



	"dh",

	"OpenSSL PKCS#3 DH method",



	0,

	0,

	0,