OpenSSL: openssl/apps/ genpkey.c

  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:  
12-Jul-2006 20:00:20
  Branch: HEAD                             Handle:
2006071219002000

  Modified files:
    openssl/apps            genpkey.c

  Log:
    In genpkey, also look for algorithm string name in any
supplied
    ENGINE.

  Summary:
    Revision    Changes     Path
    1.9         +6  -0      openssl/apps/genpkey.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/apps/genpkey.c
 
============================================================
================
  $ cvs diff -u -r1.8 -r1.9 genpkey.c
  --- openssl/apps/genpkey.c	10 Jul 2006 22:49:07 -0000	1.8
  +++ openssl/apps/genpkey.c	12 Jul 2006 18:00:20 -0000	1.9
   -375,14 +375,20 
   		BIO_puts(err, "Algorithm already set!\n");
   		return 0;
   		}
  +
   	ameth = EVP_PKEY_asn1_find_str(&tmpeng, algname,
-1);
   
  +	if (!ameth && e)
  +		ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1);
  +
   	if (!ameth)
   		{
   		BIO_printf(bio_err, "Algorithm %s not
found\n", algname);
   		return 0;
   		}
   
  +	ERR_clear_error();
  +
   	EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL,
NULL, ameth);
   #ifndef OPENSSL_NO_ENGINE
   	if (tmpeng)
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org