Merge lp:~scolphoy/hipl/RSA_generate_key_ex into lp:hipl

[Pupu Toivonen]

Change RSA_generate_key to RSA_generate_key_ex in crypto.c

The RSA_generate_key function has been deprecated in OpenSSL
in favour of the newer function RSA_generate_key_ex.
http://www.openssl.org/docs/crypto/RSA_generate_key.html

RSA_generate_key_ex with its current interface has been
part of OpenSSL starting from version 0.9.8 (July 2005).
Granted it still remains a bit poorly documented.

If OpenSSL was compiled with the 'no-deprecated' argument,
the old function will not be available. This is the case
e.g. with modern versions of Android.

I tried compiling the revision from trunk added with
these changes and connecting to a hip-enabled host;
I found no difference in operation compared to using
the older function.

[Miika Komu (miika-iki)]

Use the hooks (or set the copyright year manually). Please fix and then merge.

review: Needs Fixing

[lp:~scolphoy/hipl/RSA_generate_key_ex]

6433. By Pupu Toivonen on 2013-09-20

Update year in copyright tag

Unmerged revisions

=== modified file 'libcore/crypto.c'
--- libcore/crypto.c	2012-05-12 06:54:33 +0000
+++ libcore/crypto.c	2013-09-20 06:30:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 Aalto University and RWTH Aachen University.
+ * Copyright (c) 2010-2013 Aalto University and RWTH Aachen University.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -766,13 +766,14 @@
  */
 RSA *create_rsa_key(const int bits)
 {
-    RSA *rsa = NULL;
+    RSA    *rsa = RSA_new();
+    BIGNUM *f4  = BN_new();
+    BN_set_word(f4, RSA_F4);
 
     /* generate private and public keys */
     HIP_DEBUG("*****************Creating RSA of %d bits\n\n\n", bits);
-    rsa = RSA_generate_key(bits, RSA_F4, NULL, NULL);
-    if (!rsa) {
-        HIP_ERROR("create_rsa_key failed (RSA_generate_key): %s\n",
+    if (!RSA_generate_key_ex(rsa, bits, f4, NULL)) {
+        HIP_ERROR("create_rsa_key failed (RSA_generate_key_ex): %s\n",
                   ERR_error_string(ERR_get_error(), NULL));
         goto err_out;
     }