OpenSSL: openssl/crypto/asn1/ ameth_lib.c openssl/crypto/evp/ ev...

  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:  
21-Apr-2006 19:38:59
  Branch: HEAD                             Handle:
2006042118385800

  Modified files:
    openssl/crypto/asn1     ameth_lib.c
    openssl/crypto/evp      evp.h

  Log:
    Add 'flags' parameter to EVP_PKEY_asn1_meth_new() to
set algorithm
    flags.

  Summary:
    Revision    Changes     Path
    1.14        +3  -4      openssl/crypto/asn1/ameth_lib.c
    1.147       +1  -1      openssl/crypto/evp/evp.h
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/asn1/ameth_lib.c
 
============================================================
================
  $ cvs diff -u -r1.13 -r1.14 ameth_lib.c
  --- openssl/crypto/asn1/ameth_lib.c	17 Apr 2006 17:12:21
-0000	1.13
  +++ openssl/crypto/asn1/ameth_lib.c	21 Apr 2006 17:38:58
-0000	1.14
   -191,11 +191,10 
   int EVP_PKEY_asn1_add_alias(int to, int from)
   	{
   	EVP_PKEY_ASN1_METHOD *ameth;
  -	ameth = EVP_PKEY_asn1_new(from, NULL, NULL);
  +	ameth = EVP_PKEY_asn1_new(from, ASN1_PKEY_ALIAS, NULL,
NULL);
   	if (!ameth)
   		return 0;
   	ameth->pkey_base_id = to;
  -	ameth->pkey_flags |= ASN1_PKEY_ALIAS;
   	return EVP_PKEY_asn1_add0(ameth);
   	}
   
   -218,7 +217,7 
   	return 1;
   	}
   
  -EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id,
  +EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int
flags,
   					const char *pem_str, const char *info)
   	{
   	EVP_PKEY_ASN1_METHOD *ameth;
   -228,7 +227,7 
   
   	ameth->pkey_id = id;
   	ameth->pkey_base_id = id;
  -	ameth->pkey_flags = ASN1_PKEY_DYNAMIC;
  +	ameth->pkey_flags = flags | ASN1_PKEY_DYNAMIC;
   
   	if (info)
   		{
   .
  patch -p0 <<' .'
  Index: openssl/crypto/evp/evp.h
 
============================================================
================
  $ cvs diff -u -r1.146 -r1.147 evp.h
  --- openssl/crypto/evp/evp.h	19 Apr 2006 17:05:57
-0000	1.146
  +++ openssl/crypto/evp/evp.h	21 Apr 2006 17:38:58
-0000	1.147
   -815,7 +815,7 
   				const char **pinfo, const char **ppem_str,
   					const EVP_PKEY_ASN1_METHOD *ameth);
   
  -EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id,
  +EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int
flags,
   					const char *pem_str, const char *info);
   void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth);
   void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD
*ameth,
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org