List Info

Thread: OpenSSL: openssl/crypto/asn1/ Makefile ameth_lib.c asn1_locl.h o...
OpenSSL: openssl/crypto/asn1/ Makefile ameth_lib.c asn1_locl.h o...
user name
 2006-03-23 11:54:51 
  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
23-Mar-2006 12:54:51
  Branch: HEAD                             Handle:
2006032311544605

  Modified files:
    openssl/crypto/asn1     Makefile ameth_lib.c asn1_locl.h
    openssl/crypto/dh       Makefile dh_ameth.c
    openssl/crypto/dsa      Makefile dsa_ameth.c
    openssl/crypto/ec       Makefile ec_ameth.c
    openssl/crypto/evp      Makefile evp.h
    openssl/crypto/pem      pem_lib.c
    openssl/crypto/rsa      Makefile rsa_ameth.c

  Log:
    Add information and pem strings. Update dependencies.

  Summary:
    Revision    Changes     Path
    1.10        +23 -9      openssl/crypto/asn1/Makefile
    1.4         +34 -1      openssl/crypto/asn1/ameth_lib.c
    1.3         +3  -0      openssl/crypto/asn1/asn1_locl.h
    1.8         +23 -0      openssl/crypto/dh/Makefile
    1.3         +3  -0      openssl/crypto/dh/dh_ameth.c
    1.8         +25 -0      openssl/crypto/dsa/Makefile
    1.5         +3  -0      openssl/crypto/dsa/dsa_ameth.c
    1.9         +24 -0      openssl/crypto/ec/Makefile
    1.6         +3  -1      openssl/crypto/ec/ec_ameth.c
    1.7         +8  -8      openssl/crypto/evp/Makefile
    1.119       +22 -0      openssl/crypto/evp/evp.h
    1.56        +22 -0      openssl/crypto/pem/pem_lib.c
    1.10        +25 -0      openssl/crypto/rsa/Makefile
    1.5         +3  -0      openssl/crypto/rsa/rsa_ameth.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/asn1/Makefile
 
============================================================
================
  $ cvs diff -u -r1.9 -r1.10 Makefile
  --- openssl/crypto/asn1/Makefile	20 Mar 2006 12:22:19
-0000	1.9
  +++ openssl/crypto/asn1/Makefile	23 Mar 2006 11:54:46
-0000	1.10
   -279,7 +279,8 
   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/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: ../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/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
   .
  patch -p0 <<' .'
  Index: openssl/crypto/asn1/ameth_lib.c
 
============================================================
================
  $ cvs diff -u -r1.3 -r1.4 ameth_lib.c
  --- openssl/crypto/asn1/ameth_lib.c	22 Mar 2006 17:59:45
-0000	1.3
  +++ openssl/crypto/asn1/ameth_lib.c	23 Mar 2006 11:54:47
-0000	1.4
   -143,7 +143,8 
   	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));
   -153,6 +154,20 
   	ameth->pkey_id = 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;
   -180,6 +195,24 
   	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,
   .
  patch -p0 <<' .'
  Index: openssl/crypto/asn1/asn1_locl.h
 
============================================================
================
  $ cvs diff -u -r1.2 -r1.3 asn1_locl.h
  --- openssl/crypto/asn1/asn1_locl.h	22 Mar 2006 17:59:45
-0000	1.2
  +++ openssl/crypto/asn1/asn1_locl.h	23 Mar 2006 11:54:47
-0000	1.3
   -80,6 +80,9 
   	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);
   .
  patch -p0 <<' .'
  Index: openssl/crypto/dh/Makefile
 
============================================================
================
  $ cvs diff -u -r1.7 -r1.8 Makefile
  --- openssl/crypto/dh/Makefile	22 Mar 2006 13:34:17
-0000	1.7
  +++ openssl/crypto/dh/Makefile	23 Mar 2006 11:54:47
-0000	1.8
   -76,6 +76,20 
   
   # 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/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
   .
  patch -p0 <<' .'
  Index: openssl/crypto/dh/dh_ameth.c
 
============================================================
================
  $ cvs diff -u -r1.2 -r1.3 dh_ameth.c
  --- openssl/crypto/dh/dh_ameth.c	22 Mar 2006 17:59:46
-0000	1.2
  +++ openssl/crypto/dh/dh_ameth.c	23 Mar 2006 11:54:47
-0000	1.3
   -73,6 +73,9 
   	EVP_PKEY_DH,
   	0,
   
  +	"dh",
  +	"OpenSSL PKCS#3 DH method",
  +
   	0,
   	0,
   	0,
   .
  patch -p0 <<' .'
  Index: openssl/crypto/dsa/Makefile
 
============================================================
================
  $ cvs diff -u -r1.7 -r1.8 Makefile
  --- openssl/crypto/dsa/Makefile	22 Mar 2006 13:34:18
-0000	1.7
  +++ openssl/crypto/dsa/Makefile	23 Mar 2006 11:54:48
-0000	1.8
   -76,6 +76,21 
   
   # DO NOT DELETE THIS LINE -- make depend depends on it.
   
  +dsa_ameth.o: ../../e_os.h ../../include/openssl/asn1.h
  +dsa_ameth.o: ../../include/openssl/bio.h
../../include/openssl/buffer.h
  +dsa_ameth.o: ../../include/openssl/crypto.h
../../include/openssl/dsa.h
  +dsa_ameth.o: ../../include/openssl/e_os2.h
../../include/openssl/ec.h
  +dsa_ameth.o: ../../include/openssl/ecdh.h
../../include/openssl/ecdsa.h
  +dsa_ameth.o: ../../include/openssl/err.h
../../include/openssl/evp.h
  +dsa_ameth.o: ../../include/openssl/lhash.h
../../include/openssl/obj_mac.h
  +dsa_ameth.o: ../../include/openssl/objects.h
  +dsa_ameth.o: ../../include/openssl/opensslconf.h
  +dsa_ameth.o: ../../include/openssl/opensslv.h
../../include/openssl/ossl_typ.h
  +dsa_ameth.o: ../../include/openssl/pkcs7.h
../../include/openssl/safestack.h
  +dsa_ameth.o: ../../include/openssl/sha.h
../../include/openssl/stack.h
  +dsa_ameth.o: ../../include/openssl/symhacks.h
../../include/openssl/x509.h
  +dsa_ameth.o: ../../include/openssl/x509_vfy.h
../asn1/asn1_locl.h ../cryptlib.h
  +dsa_ameth.o: dsa_ameth.c
   dsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
   dsa_asn1.o: ../../include/openssl/asn1t.h
../../include/openssl/bio.h
   dsa_asn1.o: ../../include/openssl/buffer.h
../../include/openssl/crypto.h
   -142,6 +157,16 
   dsa_ossl.o: ../../include/openssl/rand.h
../../include/openssl/safestack.h
   dsa_ossl.o: ../../include/openssl/stack.h
../../include/openssl/symhacks.h
   dsa_ossl.o: ../cryptlib.h dsa_ossl.c
  +dsa_prn.o: ../../e_os.h ../../include/openssl/asn1.h
  +dsa_prn.o: ../../include/openssl/bio.h
../../include/openssl/buffer.h
  +dsa_prn.o: ../../include/openssl/crypto.h
../../include/openssl/dsa.h
  +dsa_prn.o: ../../include/openssl/e_os2.h
../../include/openssl/err.h
  +dsa_prn.o: ../../include/openssl/evp.h
../../include/openssl/lhash.h
  +dsa_prn.o: ../../include/openssl/obj_mac.h
../../include/openssl/objects.h
  +dsa_prn.o: ../../include/openssl/opensslconf.h
../../include/openssl/opensslv.h
  +dsa_prn.o: ../../include/openssl/ossl_typ.h
../../include/openssl/safestack.h
  +dsa_prn.o: ../../include/openssl/stack.h
../../include/openssl/symhacks.h
  +dsa_prn.o: ../cryptlib.h dsa_prn.c
   dsa_sign.o: ../../e_os.h ../../include/openssl/asn1.h
   dsa_sign.o: ../../include/openssl/bio.h
../../include/openssl/bn.h
   dsa_sign.o: ../../include/openssl/buffer.h
../../include/openssl/crypto.h
   .
  patch -p0 <<' .'
  Index: openssl/crypto/dsa/dsa_ameth.c
 
============================================================
================
  $ cvs diff -u -r1.4 -r1.5 dsa_ameth.c
  --- openssl/crypto/dsa/dsa_ameth.c	22 Mar 2006 17:59:47
-0000	1.4
  +++ openssl/crypto/dsa/dsa_ameth.c	23 Mar 2006 11:54:48
-0000	1.5
   -526,6 +526,9 
   		EVP_PKEY_DSA,
   		0,
   
  +		"dsa",
  +		"OpenSSL DSA method",
  +
   		dsa_pub_decode,
   		dsa_pub_encode,
   		dsa_pub_cmp,
   .
  patch -p0 <<' .'
  Index: openssl/crypto/ec/Makefile
 
============================================================
================
  $ cvs diff -u -r1.8 -r1.9 Makefile
  --- openssl/crypto/ec/Makefile	22 Mar 2006 13:34:18
-0000	1.8
  +++ openssl/crypto/ec/Makefile	23 Mar 2006 11:54:49
-0000	1.9
   -95,6 +95,20 
   ec2_smpl.o: ../../include/openssl/opensslv.h
../../include/openssl/ossl_typ.h
   ec2_smpl.o: ../../include/openssl/safestack.h
../../include/openssl/stack.h
   ec2_smpl.o: ../../include/openssl/symhacks.h ec2_smpl.c
ec_lcl.h
  +ec_ameth.o: ../../e_os.h ../../include/openssl/asn1.h
  +ec_ameth.o: ../../include/openssl/bio.h
../../include/openssl/buffer.h
  +ec_ameth.o: ../../include/openssl/crypto.h
../../include/openssl/e_os2.h
  +ec_ameth.o: ../../include/openssl/ec.h
../../include/openssl/ecdh.h
  +ec_ameth.o: ../../include/openssl/ecdsa.h
../../include/openssl/err.h
  +ec_ameth.o: ../../include/openssl/evp.h
../../include/openssl/lhash.h
  +ec_ameth.o: ../../include/openssl/obj_mac.h
../../include/openssl/objects.h
  +ec_ameth.o: ../../include/openssl/opensslconf.h
  +ec_ameth.o: ../../include/openssl/opensslv.h
../../include/openssl/ossl_typ.h
  +ec_ameth.o: ../../include/openssl/pkcs7.h
../../include/openssl/safestack.h
  +ec_ameth.o: ../../include/openssl/sha.h
../../include/openssl/stack.h
  +ec_ameth.o: ../../include/openssl/symhacks.h
../../include/openssl/x509.h
  +ec_ameth.o: ../../include/openssl/x509_vfy.h
../asn1/asn1_locl.h ../cryptlib.h
  +ec_ameth.o: ec_ameth.c
   ec_asn1.o: ../../include/openssl/asn1.h
../../include/openssl/asn1t.h
   ec_asn1.o: ../../include/openssl/bio.h
../../include/openssl/bn.h
   ec_asn1.o: ../../include/openssl/crypto.h
../../include/openssl/e_os2.h
   -166,6 +180,16 
   ec_print.o: ../../include/openssl/opensslv.h
../../include/openssl/ossl_typ.h
   ec_print.o: ../../include/openssl/safestack.h
../../include/openssl/stack.h
   ec_print.o: ../../include/openssl/symhacks.h ec_lcl.h
ec_print.c
  +eck_prn.o: ../../e_os.h ../../include/openssl/asn1.h
  +eck_prn.o: ../../include/openssl/bio.h
../../include/openssl/buffer.h
  +eck_prn.o: ../../include/openssl/crypto.h
../../include/openssl/e_os2.h
  +eck_prn.o: ../../include/openssl/ec.h
../../include/openssl/err.h
  +eck_prn.o: ../../include/openssl/evp.h
../../include/openssl/lhash.h
  +eck_prn.o: ../../include/openssl/obj_mac.h
../../include/openssl/objects.h
  +eck_prn.o: ../../include/openssl/opensslconf.h
../../include/openssl/opensslv.h
  +eck_prn.o: ../../include/openssl/ossl_typ.h
../../include/openssl/safestack.h
  +eck_prn.o: ../../include/openssl/stack.h
../../include/openssl/symhacks.h
  +eck_prn.o: ../cryptlib.h eck_prn.c
   ecp_mont.o: ../../include/openssl/asn1.h
../../include/openssl/bio.h
   ecp_mont.o: ../../include/openssl/bn.h
../../include/openssl/crypto.h
   ecp_mont.o: ../../include/openssl/e_os2.h
../../include/openssl/ec.h
   .
  patch -p0 <<' .'
  Index: openssl/crypto/ec/ec_ameth.c
 
============================================================
================
  $ cvs diff -u -r1.5 -r1.6 ec_ameth.c
  --- openssl/crypto/ec/ec_ameth.c	22 Mar 2006 17:59:47
-0000	1.5
  +++ openssl/crypto/ec/ec_ameth.c	23 Mar 2006 11:54:49
-0000	1.6
   -538,8 +538,10 
   EVP_PKEY_ASN1_METHOD eckey_asn1_meth = 
   	{
   	EVP_PKEY_EC,
  +	EVP_PKEY_EC,
   	0,
  -	0,
  +	"ec",
  +	"OpenSSL EC algorithm",
   
   	eckey_pub_decode,
   	eckey_pub_encode,
   .
  patch -p0 <<' .'
  Index: openssl/crypto/evp/Makefile
 
============================================================
================
  $ cvs diff -u -r1.6 -r1.7 Makefile
  --- openssl/crypto/evp/Makefile	4 Feb 2006 01:45:32
-0000	1.6
  +++ openssl/crypto/evp/Makefile	23 Mar 2006 11:54:49
-0000	1.7
   -354,9 +354,8 
   evp_pbe.o: ../../include/openssl/x509.h
../../include/openssl/x509_vfy.h
   evp_pbe.o: ../cryptlib.h evp_pbe.c
   evp_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
  -evp_pkey.o: ../../include/openssl/bio.h
../../include/openssl/bn.h
  -evp_pkey.o: ../../include/openssl/buffer.h
../../include/openssl/crypto.h
  -evp_pkey.o: ../../include/openssl/dsa.h
../../include/openssl/e_os2.h
  +evp_pkey.o: ../../include/openssl/bio.h
../../include/openssl/buffer.h
  +evp_pkey.o: ../../include/openssl/crypto.h
../../include/openssl/e_os2.h
   evp_pkey.o: ../../include/openssl/ec.h
../../include/openssl/ecdh.h
   evp_pkey.o: ../../include/openssl/ecdsa.h
../../include/openssl/err.h
   evp_pkey.o: ../../include/openssl/evp.h
../../include/openssl/lhash.h
   -364,10 +363,10 
   evp_pkey.o: ../../include/openssl/opensslconf.h
   evp_pkey.o: ../../include/openssl/opensslv.h
../../include/openssl/ossl_typ.h
   evp_pkey.o: ../../include/openssl/pkcs7.h
../../include/openssl/rand.h
  -evp_pkey.o: ../../include/openssl/rsa.h
../../include/openssl/safestack.h
  -evp_pkey.o: ../../include/openssl/sha.h
../../include/openssl/stack.h
  -evp_pkey.o: ../../include/openssl/symhacks.h
../../include/openssl/x509.h
  -evp_pkey.o: ../../include/openssl/x509_vfy.h
../cryptlib.h evp_pkey.c
  +evp_pkey.o: ../../include/openssl/safestack.h
../../include/openssl/sha.h
  +evp_pkey.o: ../../include/openssl/stack.h
../../include/openssl/symhacks.h
  +evp_pkey.o: ../../include/openssl/x509.h
../../include/openssl/x509_vfy.h
  +evp_pkey.o: ../asn1/asn1_locl.h ../cryptlib.h evp_pkey.c
   m_dss.o: ../../e_os.h ../../include/openssl/asn1.h
../../include/openssl/bio.h
   m_dss.o: ../../include/openssl/buffer.h
../../include/openssl/crypto.h
   m_dss.o: ../../include/openssl/dsa.h
../../include/openssl/e_os2.h
   -596,7 +595,8 
   p_lib.o: ../../include/openssl/rsa.h
../../include/openssl/safestack.h
   p_lib.o: ../../include/openssl/sha.h
../../include/openssl/stack.h
   p_lib.o: ../../include/openssl/symhacks.h
../../include/openssl/x509.h
  -p_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
p_lib.c
  +p_lib.o: ../../include/openssl/x509_vfy.h
../asn1/asn1_locl.h ../cryptlib.h
  +p_lib.o: p_lib.c
   p_open.o: ../../e_os.h ../../include/openssl/asn1.h
../../include/openssl/bio.h
   p_open.o: ../../include/openssl/buffer.h
../../include/openssl/crypto.h
   p_open.o: ../../include/openssl/e_os2.h
../../include/openssl/ec.h
   .
  patch -p0 <<' .'
  Index: openssl/crypto/evp/evp.h
 
============================================================
================
  $ cvs diff -u -r1.118 -r1.119 evp.h
  --- openssl/crypto/evp/evp.h	22 Mar 2006 17:59:48
-0000	1.118
  +++ openssl/crypto/evp/evp.h	23 Mar 2006 11:54:49
-0000	1.119
   -856,6 +856,28 
   void EVP_PBE_cleanup(void);
   
   const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(int type);
  +int EVP_PKEY_asn1_add(const EVP_PKEY_ASN1_METHOD *ameth);
  +EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id,
  +					const char *pem_str, const char *info);
  +void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth);
  +void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD
*ameth,
  +		int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO
*p8inf),
  +		int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const
EVP_PKEY *pk),
  +		int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int
indent,
  +							ASN1_PCTX *pctx));
  +void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
  +		int (*param_decode)(const EVP_PKEY *pk, X509_PUBKEY
*pub),
  +		int (*param_encode)(X509_PUBKEY *pub, const EVP_PKEY
*pk),
  +		int (*param_missing)(const EVP_PKEY *pk),
  +		int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from),
  +		int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),
  +		int (*param_print)(BIO *out, const EVP_PKEY *pkey, int
indent,
  +							ASN1_PCTX *pctx));
  +void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
  +		void (*pkey_free)(EVP_PKEY *pkey));
  +void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
  +		void (*pkey_ctrl)(EVP_PKEY *pkey, int op,
  +							long arg1, void *arg2));
   
   /* BEGIN ERROR CODES */
   /* The following lines are auto generated by the script
mkerr.pl. Any changes
   .
  patch -p0 <<' .'
  Index: openssl/crypto/pem/pem_lib.c
 
============================================================
================
  $ cvs diff -u -r1.55 -r1.56 pem_lib.c
  --- openssl/crypto/pem/pem_lib.c	11 May 2005 03:45:30
-0000	1.55
  +++ openssl/crypto/pem/pem_lib.c	23 Mar 2006 11:54:50
-0000	1.56
   -57,6 +57,7 
    */
   
   #include <stdio.h>
  +#include <ctype.h>
   #include "cryptlib.h"
   #include <openssl/buffer.h>
   #include <openssl/objects.h>
   -776,3 +777,24 
   	BUF_MEM_free(dataB);
   	return(0);
   	}
  +
  +/* Check pem string and return prefix length.
  + * If for example the pem_str == "RSA PRIVATE
KEY" and suffix = "PRIVATE KEY"
  + * the return value is 3 for the string
"RSA".
  + */
  +
  +int pem_check_suffix(char *pem_str, char *suffix)
  +	{
  +	int pem_len = strlen(pem_str);
  +	int suffix_len = strlen(suffix);
  +	char *p;
  +	if (suffix_len + 1 >= pem_len)
  +		return 0;
  +	if (strcmp(pem_str - suffix_len, suffix))
  +		return 0;
  +	p = pem_str - suffix_len - 1;
  +	if (*p != ' ')
  +		return 0;
  +	return p - pem_str;
  +	}
  +
   .
  patch -p0 <<' .'
  Index: openssl/crypto/rsa/Makefile
 
============================================================
================
  $ cvs diff -u -r1.9 -r1.10 Makefile
  --- openssl/crypto/rsa/Makefile	22 Mar 2006 13:34:19
-0000	1.9
  +++ openssl/crypto/rsa/Makefile	23 Mar 2006 11:54:50
-0000	1.10
   -78,6 +78,21 
   
   # DO NOT DELETE THIS LINE -- make depend depends on it.
   
  +rsa_ameth.o: ../../e_os.h ../../include/openssl/asn1.h
  +rsa_ameth.o: ../../include/openssl/asn1t.h
../../include/openssl/bio.h
  +rsa_ameth.o: ../../include/openssl/buffer.h
../../include/openssl/crypto.h
  +rsa_ameth.o: ../../include/openssl/e_os2.h
../../include/openssl/ec.h
  +rsa_ameth.o: ../../include/openssl/ecdh.h
../../include/openssl/ecdsa.h
  +rsa_ameth.o: ../../include/openssl/err.h
../../include/openssl/evp.h
  +rsa_ameth.o: ../../include/openssl/lhash.h
../../include/openssl/obj_mac.h
  +rsa_ameth.o: ../../include/openssl/objects.h
  +rsa_ameth.o: ../../include/openssl/opensslconf.h
  +rsa_ameth.o: ../../include/openssl/opensslv.h
../../include/openssl/ossl_typ.h
  +rsa_ameth.o: ../../include/openssl/pkcs7.h
../../include/openssl/rsa.h
  +rsa_ameth.o: ../../include/openssl/safestack.h
../../include/openssl/sha.h
  +rsa_ameth.o: ../../include/openssl/stack.h
../../include/openssl/symhacks.h
  +rsa_ameth.o: ../../include/openssl/x509.h
../../include/openssl/x509_vfy.h
  +rsa_ameth.o: ../asn1/asn1_locl.h ../cryptlib.h
rsa_ameth.c
   rsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
   rsa_asn1.o: ../../include/openssl/asn1t.h
../../include/openssl/bio.h
   rsa_asn1.o: ../../include/openssl/bn.h
../../include/openssl/buffer.h
   -179,6 +194,16 
   rsa_pk1.o: ../../include/openssl/rand.h
../../include/openssl/rsa.h
   rsa_pk1.o: ../../include/openssl/safestack.h
../../include/openssl/stack.h
   rsa_pk1.o: ../../include/openssl/symhacks.h ../cryptlib.h
rsa_pk1.c
  +rsa_prn.o: ../../e_os.h ../../include/openssl/asn1.h
  +rsa_prn.o: ../../include/openssl/bio.h
../../include/openssl/buffer.h
  +rsa_prn.o: ../../include/openssl/crypto.h
../../include/openssl/e_os2.h
  +rsa_prn.o: ../../include/openssl/err.h
../../include/openssl/evp.h
  +rsa_prn.o: ../../include/openssl/lhash.h
../../include/openssl/obj_mac.h
  +rsa_prn.o: ../../include/openssl/objects.h
../../include/openssl/opensslconf.h
  +rsa_prn.o: ../../include/openssl/opensslv.h
../../include/openssl/ossl_typ.h
  +rsa_prn.o: ../../include/openssl/rsa.h
../../include/openssl/safestack.h
  +rsa_prn.o: ../../include/openssl/stack.h
../../include/openssl/symhacks.h
  +rsa_prn.o: ../cryptlib.h rsa_prn.c
   rsa_pss.o: ../../e_os.h ../../include/openssl/asn1.h
   rsa_pss.o: ../../include/openssl/bio.h
../../include/openssl/bn.h
   rsa_pss.o: ../../include/openssl/buffer.h
../../include/openssl/crypto.h
   .
  patch -p0 <<' .'
  Index: openssl/crypto/rsa/rsa_ameth.c
 
============================================================
================
  $ cvs diff -u -r1.4 -r1.5 rsa_ameth.c
  --- openssl/crypto/rsa/rsa_ameth.c	22 Mar 2006 17:59:49
-0000	1.4
  +++ openssl/crypto/rsa/rsa_ameth.c	23 Mar 2006 11:54:51
-0000	1.5
   -256,6 +256,9 
   		EVP_PKEY_RSA,
   		0,
   
  +		"rsa",
  +		"OpenSSL RSA method",
  +
   		rsa_pub_decode,
   		rsa_pub_encode,
   		rsa_pub_cmp,
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org
[1]

about | contact  Other archives ( Real Estate discussion Medical topics )