Merge branch 'master'.
authorWerner Koch <wk@gnupg.org>
Mon, 23 May 2011 11:48:30 +0000 (13:48 +0200)
committerWerner Koch <wk@gnupg.org>
Mon, 23 May 2011 11:48:30 +0000 (13:48 +0200)
Actually the same fix I did a few hours ago.

1  2 
cipher/ChangeLog
cipher/pubkey.c

@@@ -1,7 -1,7 +1,7 @@@
- 2011-05-23  Werner Koch  <wk@g10code.com>
+ 2011-05-23  Daiki Ueno  <ueno@unixuser.org>
  
-       * pubkey.c (pkcs1_decode_for_encryption): Fix a memory leak in
-       case of a failing gcry_mpi_print.
+       * pubkey.c (pkcs1_decode_for_encryption, oaep_decode): Fix memleak
 -      when gcry_mpi_scan fails.
++      when gcry_mpi_print fails.
  
  2011-05-18  Daiki Ueno  <ueno@unixuser.org>
  
diff --cc cipher/pubkey.c
Simple merge