Nils Larsch submitted;

  - a patch to fix a memory leak in rsa_gen.c
  - a note about compiler warnings with unions
  - a note about improving structure element names

This applies his patch and implements a solution to the notes.

1 files changed, 1 insertions, 3 deletions

diff --git a/crypto/rsa/rsa_depr.c b/crypto/rsa/rsa_depr.c
index 25fa954393..3773d037c6 100644
--- a/crypto/rsa/rsa_depr.c
+++ b/crypto/rsa/rsa_depr.c
@@ -71,9 +71,7 @@ RSA *RSA_generate_key(int bits, unsigned long e_value,
 	if((rsa=RSA_new()) == NULL)
 		return 0;
 
-	cb.ver = 1;
-	cb.arg = cb_arg;
-	cb.cb_1 = callback;
+	BN_GENCB_set_old(&cb, callback, cb_arg);
 
 	if(RSA_generate_key_ex(rsa, bits, e_value, &cb))
 		return rsa;