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

List:       openssl-cvs
Subject:    [CVS] OpenSSL: OpenSSL_0_9_8-stable: openssl/apps/ apps.c
From:       "Dr. Stephen Henson" <steve () openssl ! org>
Date:       2010-05-27 14:09:23
Message-ID: 20100527140923.0F0561EAE99A () master ! openssl ! org
[Download RAW message or body]

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

  Server: cvs.openssl.org                  Name:   Dr. Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steve@openssl.org
  Module: openssl                          Date:   27-May-2010 16:09:22
  Branch: OpenSSL_0_9_8-stable             Handle: 2010052715092200

  Modified files:           (Branch: OpenSSL_0_9_8-stable)
    openssl/apps            apps.c

  Log:
    PR: 2262
    Submitted By: Victor Wagner <vitus@cryptocom.ru>
    
    Fix error reporting in load_key function.

  Summary:
    Revision    Changes     Path
    1.91.2.15   +12 -2      openssl/apps/apps.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/apps/apps.c
  ============================================================================
  $ cvs diff -u -r1.91.2.14 -r1.91.2.15 apps.c
  --- openssl/apps/apps.c	19 Jan 2010 19:10:53 -0000	1.91.2.14
  +++ openssl/apps/apps.c	27 May 2010 14:09:22 -0000	1.91.2.15
  @@ -866,10 +866,17 @@
   	if (format == FORMAT_ENGINE)
   		{
   		if (!e)
  -			BIO_printf(bio_err,"no engine specified\n");
  +			BIO_printf(err,"no engine specified\n");
   		else
  +			{
   			pkey = ENGINE_load_private_key(e, file,
   				ui_method, &cb_data);
  +			if (!pkey) 
  +				{
  +				BIO_printf(err,"cannot load %s from engine\n",key_descrip);
  +				ERR_print_errors(err);
  +				}	
  +			}
   		goto end;
   		}
   #endif
  @@ -919,8 +926,11 @@
   		}
    end:
   	if (key != NULL) BIO_free(key);
  -	if (pkey == NULL)
  +	if (pkey == NULL) 
  +		{
   		BIO_printf(err,"unable to load %s\n", key_descrip);
  +		ERR_print_errors(err);
  +		}	
   	return(pkey);
   	}
   
  @@ .
______________________________________________________________________
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]