resolve conflicts

1 files changed, 44 insertions, 33 deletions

diff --git a/src/lib/libssl/src/apps/genrsa.c b/src/lib/libssl/src/apps/genrsa.c
index 7dbd0923b6..1599bb7a69 100644
--- a/src/lib/libssl/src/apps/genrsa.c
+++ b/src/lib/libssl/src/apps/genrsa.c
@@ -56,6 +56,13 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/opensslconf.h>
+/* Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code */
+#ifdef OPENSSL_NO_DEPRECATED
+#undef OPENSSL_NO_DEPRECATED
+#endif
+
 #ifndef OPENSSL_NO_RSA
 #include <stdio.h>
 #include <string.h>
@@ -75,22 +82,19 @@
 #undef PROG
 #define PROG genrsa_main
 
-static void MS_CALLBACK genrsa_cb(int p, int n, void *arg);
+static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
         {
+        BN_GENCB cb;
 #ifndef OPENSSL_NO_ENGINE
         ENGINE *e = NULL;
 #endif
         int ret=1;
-        RSA *rsa=NULL;
         int i,num=DEFBITS;
         long l;
-#ifdef OPENSSL_FIPS
-        int use_x931 = 0;
-#endif
         const EVP_CIPHER *enc=NULL;
         unsigned long f4=RSA_F4;
         char *outfile=NULL;
@@ -100,8 +104,13 @@ int MAIN(int argc, char **argv)
 #endif
         char *inrand=NULL;
         BIO *out=NULL;
+        BIGNUM *bn = BN_new();
+        RSA *rsa = RSA_new();
+
+        if(!bn || !rsa) goto err;
 
         apps_startup();
+        BN_GENCB_set(&cb, genrsa_cb, bio_err);
 
         if (bio_err == NULL)
                 if ((bio_err=BIO_new(BIO_s_file())) != NULL)
@@ -129,10 +138,6 @@ int MAIN(int argc, char **argv)
                         f4=3;
                 else if (strcmp(*argv,"-F4") == 0 || strcmp(*argv,"-f4") == 0)
                         f4=RSA_F4;
-#ifdef OPENSSL_FIPS
-                else if (strcmp(*argv,"-x931") == 0)
-                        use_x931 = 1;
-#endif
 #ifndef OPENSSL_NO_ENGINE
                 else if (strcmp(*argv,"-engine") == 0)
                         {
@@ -155,6 +160,10 @@ int MAIN(int argc, char **argv)
                 else if (strcmp(*argv,"-idea") == 0)
                         enc=EVP_idea_cbc();
 #endif
+#ifndef OPENSSL_NO_SEED
+                else if (strcmp(*argv,"-seed") == 0)
+                        enc=EVP_seed_cbc();
+#endif
 #ifndef OPENSSL_NO_AES
                 else if (strcmp(*argv,"-aes128") == 0)
                         enc=EVP_aes_128_cbc();
@@ -163,6 +172,14 @@ int MAIN(int argc, char **argv)
                 else if (strcmp(*argv,"-aes256") == 0)
                         enc=EVP_aes_256_cbc();
 #endif
+#ifndef OPENSSL_NO_CAMELLIA
+                else if (strcmp(*argv,"-camellia128") == 0)
+                        enc=EVP_camellia_128_cbc();
+                else if (strcmp(*argv,"-camellia192") == 0)
+                        enc=EVP_camellia_192_cbc();
+                else if (strcmp(*argv,"-camellia256") == 0)
+                        enc=EVP_camellia_256_cbc();
+#endif
                 else if (strcmp(*argv,"-passout") == 0)
                         {
                         if (--argc < 1) goto bad;
@@ -182,10 +199,18 @@ bad:
 #ifndef OPENSSL_NO_IDEA
                 BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
 #endif
+#ifndef OPENSSL_NO_SEED
+                BIO_printf(bio_err," -seed\n");
+                BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
+#endif
 #ifndef OPENSSL_NO_AES
                 BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
                 BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
 #endif
+#ifndef OPENSSL_NO_CAMELLIA
+                BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
+                BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
+#endif
                 BIO_printf(bio_err," -out file       output the key to 'file\n");
                 BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
                 BIO_printf(bio_err," -f4             use F4 (0x10001) for the E value\n");
@@ -240,28 +265,12 @@ bad:
 
         BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",
                 num);
-#ifdef OPENSSL_FIPS
-        if (use_x931)
-                {
-                BIGNUM *pubexp;
-                pubexp = BN_new();
-                BN_set_word(pubexp, f4);
-                rsa = RSA_X931_generate_key(num, pubexp, genrsa_cb, bio_err);
-                BN_free(pubexp);
-                }
-        else
-#endif
-                rsa=RSA_generate_key(num,f4,genrsa_cb,bio_err);
+
+        if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
+                goto err;
                 
         app_RAND_write_file(NULL, bio_err);
 
-        if (rsa == NULL)
-                {
-                BIO_printf(bio_err, "Key Generation error\n");
-
-                goto err;
-                }
-        
         /* We need to do the following for when the base number size is <
          * long, esp windows 3.1 :-(. */
         l=0L;
@@ -285,8 +294,9 @@ bad:
 
         ret=0;
 err:
-        if (rsa != NULL) RSA_free(rsa);
-        if (out != NULL) BIO_free_all(out);
+        if (bn) BN_free(bn);
+        if (rsa) RSA_free(rsa);
+        if (out) BIO_free_all(out);
         if(passout) OPENSSL_free(passout);
         if (ret != 0)
                 ERR_print_errors(bio_err);
@@ -294,7 +304,7 @@ err:
         OPENSSL_EXIT(ret);
         }
 
-static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
+static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
         {
         char c='*';
 
@@ -302,11 +312,12 @@ static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
         if (p == 1) c='+';
         if (p == 2) c='*';
         if (p == 3) c='\n';
-        BIO_write((BIO *)arg,&c,1);
-        (void)BIO_flush((BIO *)arg);
+        BIO_write(cb->arg,&c,1);
+        (void)BIO_flush(cb->arg);
 #ifdef LINT
         p=n;
 #endif
+        return 1;
         }
 #else /* !OPENSSL_NO_RSA */