[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: openssl/crypto/pem/ pem_pkey.c
From:       "Richard Levitte" <levitte () openssl ! org>
Date:       2004-02-26 22:07:45
Message-ID: 20040226220745.ACE91203EC1 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Richard Levitte
  Root:   /e/openssl/cvs                   Email:  levitte@openssl.org
  Module: openssl                          Date:   26-Feb-2004 23:07:45
  Branch: HEAD                             Handle: 2004022622074500

  Modified files:
    openssl/crypto/pem      pem_pkey.c

  Log:
    Make sure the given EVP_PKEY is updated in the PEM_STRING_PKCS8INF case also.
    PR: 833

  Summary:
    Revision    Changes     Path
    1.6         +4  -0      openssl/crypto/pem/pem_pkey.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/crypto/pem/pem_pkey.c
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 pem_pkey.c
  --- openssl/crypto/pem/pem_pkey.c	12 Aug 2002 08:47:24 -0000	1.5
  +++ openssl/crypto/pem/pem_pkey.c	26 Feb 2004 22:07:45 -0000	1.6
  @@ -89,6 +89,10 @@
   		p8inf=d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len);
   		if(!p8inf) goto p8err;
   		ret = EVP_PKCS82PKEY(p8inf);
  +		if(x) {
  +			if(*x) EVP_PKEY_free((EVP_PKEY *)*x);
  +			*x = ret;
  +		}
   		PKCS8_PRIV_KEY_INFO_free(p8inf);
   	} else if (strcmp(nm,PEM_STRING_PKCS8) == 0) {
   		PKCS8_PRIV_KEY_INFO *p8inf;
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]