Re: [patch] libssl/src/ssl/ssl_rsa.c

2014-05-08 Thread Theo de Raadt 
Your diff does not solve a problem.

 In case this is considered important enough...
 Remove unused ret from SSL_use_PrivateKey().
 
 - Michael
 
 
 Index: ssl_rsa.c
 ===
 RCS file: /cvs/src/lib/libssl/src/ssl/ssl_rsa.c,v
 retrieving revision 1.11
 diff -u -r1.11 ssl_rsa.c
 --- ssl_rsa.c 17 Apr 2014 21:37:37 -  1.11
 +++ ssl_rsa.c 9 May 2014 03:46:58 -
 @@ -273,8 +273,6 @@
  int
  SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey)
  {
 - int ret;
 -
   if (pkey == NULL) {
   SSLerr(SSL_F_SSL_USE_PRIVATEKEY, ERR_R_PASSED_NULL_PARAMETER);
   return (0);
 @@ -283,8 +281,7 @@
   SSLerr(SSL_F_SSL_USE_PRIVATEKEY, ERR_R_MALLOC_FAILURE);
   return (0);
   }
 - ret = ssl_set_pkey(ssl-cert, pkey);
 - return (ret);
 + return (ssl_set_pkey(ssl-cert, pkey));
  }
  
  #ifndef OPENSSL_NO_STDIO

Re: [patch] libssl/src/ssl/ssl_rsa.c

2014-05-08 Thread Ted Unangst 
On Thu, May 08, 2014 at 22:39, Theo de Raadt wrote:
 Your diff does not solve a problem.

Specifically, I don't think it's worth changing such code back or
forth either way, but using an extra variable to store the return value
from a function can make debugging easier. I may want to look at the
return value without having to step into the function.