Upgrade chrome's OpenSSL to same version Android ships with.

openssl/apps/req.c

 /* apps/req.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 123 matching lines @@
                 STACK_OF(CONF_VALUE) *attr_sk, char *attr_sect, int attribs,
                 unsigned long chtype);
 static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *sk,
                                 STACK_OF(CONF_VALUE) *attr, int attribs,
                                 unsigned long chtype);
 static int add_attribute_object(X509_REQ *req, char *text, const char *def,
                                 char *value, int nid, int n_min,
                                 int n_max, unsigned long chtype);
 static int add_DN_object(X509_NAME *n, char *text, const char *def, char *value,
         int nid,int n_min,int n_max, unsigned long chtype, int mval);
-#ifndef OPENSSL_NO_RSA
-static int MS_CALLBACK req_cb(int p, int n, BN_GENCB *cb);
-#endif
+static int genpkey_cb(EVP_PKEY_CTX *ctx);
 static int req_check_len(int len,int n_min,int n_max);
 static int check_end(const char *str, const char *end);
+static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr, int *pkey_type,
+                                        long *pkeylen, char **palgnam,
+                                        ENGINE *keygen_engine);
 #ifndef MONOLITH
 static char *default_config_file=NULL;
 #endif
 static CONF *req_conf=NULL;
 static int batch=0;
 
-#define TYPE_RSA        1
-#define TYPE_DSA        2
-#define TYPE_DH         3
-#define TYPE_EC         4
-
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
         {
-        ENGINE *e = NULL;
-#ifndef OPENSSL_NO_DSA
-        DSA *dsa_params=NULL;
-#endif
-#ifndef OPENSSL_NO_ECDSA
-        EC_KEY *ec_params = NULL;
-#endif
+        ENGINE *e = NULL, *gen_eng = NULL;
         unsigned long nmflag = 0, reqflag = 0;
         int ex=1,x509=0,days=30;
         X509 *x509ss=NULL;
         X509_REQ *req=NULL;
+        EVP_PKEY_CTX *genctx = NULL;
+        const char *keyalg = NULL;
+        char *keyalgstr = NULL;
+        STACK_OF(OPENSSL_STRING) *pkeyopts = NULL;
         EVP_PKEY *pkey=NULL;
-        int i=0,badops=0,newreq=0,verbose=0,pkey_type=TYPE_RSA;
+        int i=0,badops=0,newreq=0,verbose=0,pkey_type=-1;
         long newkey = -1;
         BIO *in=NULL,*out=NULL;
         int informat,outformat,verify=0,noout=0,text=0,keyform=FORMAT_PEM;
         int nodes=0,kludge=0,newhdr=0,subject=0,pubkey=0;
         char *infile,*outfile,*prog,*keyfile=NULL,*template=NULL,*keyout=NULL;
 #ifndef OPENSSL_NO_ENGINE
         char *engine=NULL;
 #endif
         char *extensions = NULL;
         char *req_exts = NULL;
         const EVP_CIPHER *cipher=NULL;
         ASN1_INTEGER *serial = NULL;
         int modulus=0;
         char *inrand=NULL;
         char *passargin = NULL, *passargout = NULL;
         char *passin = NULL, *passout = NULL;
         char *p;
         char *subj = NULL;
         int multirdn = 0;
-        const EVP_MD *md_alg=NULL,*digest=EVP_sha1();
+        const EVP_MD *md_alg=NULL,*digest=NULL;
         unsigned long chtype = MBSTRING_ASC;
 #ifndef MONOLITH
         char *to_free;
         long errline;
 #endif
 
         req_conf = NULL;
 #ifndef OPENSSL_NO_DES
         cipher=EVP_des_ede3_cbc();
 #endif
@@ skipping 22 matching lines @@
                         {
                         if (--argc < 1) goto bad;
                         outformat=str2fmt(*(++argv));
                         }
 #ifndef OPENSSL_NO_ENGINE
                 else if (strcmp(*argv,"-engine") == 0)
                         {
                         if (--argc < 1) goto bad;
                         engine= *(++argv);
                         }
+                else if (strcmp(*argv,"-keygen_engine") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        gen_eng = ENGINE_by_id(*(++argv));
+                        if (gen_eng == NULL)
+                                {
+                                BIO_printf(bio_err, "Can't find keygen engine %s\n", *argv);
+                                goto end;
+                                }
+                        }
 #endif
                 else if (strcmp(*argv,"-key") == 0)
                         {
                         if (--argc < 1) goto bad;
                         keyfile= *(++argv);
                         }
                 else if (strcmp(*argv,"-pubkey") == 0)
                         {
                         pubkey=1;
                         }
@@ skipping 36 matching lines @@
                         if (--argc < 1) goto bad;
                         passargout= *(++argv);
                         }
                 else if (strcmp(*argv,"-rand") == 0)
                         {
                         if (--argc < 1) goto bad;
                         inrand= *(++argv);
                         }
                 else if (strcmp(*argv,"-newkey") == 0)
                         {
-                        int is_numeric;
-
-                        if (--argc < 1) goto bad;
-                        p= *(++argv);
-                        is_numeric = p[0] >= '0' && p[0] <= '9';
-                        if (strncmp("rsa:",p,4) == 0 || is_numeric)
-                                {
-                                pkey_type=TYPE_RSA;
-                                if(!is_numeric)
-                                    p+=4;
-                                newkey= atoi(p);
-                                }
-                        else
-#ifndef OPENSSL_NO_DSA
-                                if (strncmp("dsa:",p,4) == 0)
-                                {
-                                X509 *xtmp=NULL;
-                                EVP_PKEY *dtmp;
-
-                                pkey_type=TYPE_DSA;
-                                p+=4;
-                                if ((in=BIO_new_file(p,"r")) == NULL)
-                                        {
-                                        perror(p);
-                                        goto end;
-                                        }
-                                if ((dsa_params=PEM_read_bio_DSAparams(in,NULL,NULL,NULL)) == NULL)
-                                        {
-                                        ERR_clear_error();
-                                        (void)BIO_reset(in);
-                                        if ((xtmp=PEM_read_bio_X509(in,NULL,NULL,NULL)) == NULL)
-                                                {
-                                                BIO_printf(bio_err,"unable to load DSA parameters from file\n");
-                                                goto end;
-                                                }
-
-                                        if ((dtmp=X509_get_pubkey(xtmp)) == NULL) goto end;
-                                        if (dtmp->type == EVP_PKEY_DSA)
-                                                dsa_params=DSAparams_dup(dtmp->pkey.dsa);
-                                        EVP_PKEY_free(dtmp);
-                                        X509_free(xtmp);
-                                        if (dsa_params == NULL)
-                                                {
-                                                BIO_printf(bio_err,"Certificate does not contain DSA parameters\n");
-                                                goto end;
-                                                }
-                                        }
-                                BIO_free(in);
-                                in=NULL;
-                                newkey=BN_num_bits(dsa_params->p);
-                                }
-                        else 
-#endif
-#ifndef OPENSSL_NO_ECDSA
-                                if (strncmp("ec:",p,3) == 0)
-                                {
-                                X509 *xtmp=NULL;
-                                EVP_PKEY *dtmp;
-                                EC_GROUP *group;
-
-                                pkey_type=TYPE_EC;
-                                p+=3;
-                                if ((in=BIO_new_file(p,"r")) == NULL)
-                                        {
-                                        perror(p);
-                                        goto end;
-                                        }
-                                if ((ec_params = EC_KEY_new()) == NULL)
-                                        goto end;
-                                group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
-                                if (group == NULL)
-                                        {
-                                        EC_KEY_free(ec_params);
-                                        ERR_clear_error();
-                                        (void)BIO_reset(in);
-                                        if ((xtmp=PEM_read_bio_X509(in,NULL,NULL,NULL)) == NULL)
-                                                {       
-                                                BIO_printf(bio_err,"unable to load EC parameters from file\n");
-                                                goto end;
-                                                }
-
-                                        if ((dtmp=X509_get_pubkey(xtmp))==NULL)
-                                                goto end;
-                                        if (dtmp->type == EVP_PKEY_EC)
-                                                ec_params = EC_KEY_dup(dtmp->pkey.ec);
-                                        EVP_PKEY_free(dtmp);
-                                        X509_free(xtmp);
-                                        if (ec_params == NULL)
-                                                {
-                                                BIO_printf(bio_err,"Certificate does not contain EC parameters\n");
-                                                goto end;
-                                                }
-                                        }
-                                else
-                                        {
-                                        if (EC_KEY_set_group(ec_params, group) == 0)
-                                                goto end;
-                                        EC_GROUP_free(group);
-                                        }
-
-                                BIO_free(in);
-                                in=NULL;
-                                newkey = EC_GROUP_get_degree(EC_KEY_get0_group(ec_params));
-                                }
-                        else
-#endif
-#ifndef OPENSSL_NO_DH
-                                if (strncmp("dh:",p,4) == 0)
-                                {
-                                pkey_type=TYPE_DH;
-                                p+=3;
-                                }
-                        else
-#endif
-                                {
+                        if (--argc < 1)
                                 goto bad;
-                                }
-
+                        keyalg = *(++argv);
                         newreq=1;
                         }
+                else if (strcmp(*argv,"-pkeyopt") == 0)
+                        {
+                        if (--argc < 1)
+                                goto bad;
+                        if (!pkeyopts)
+                                pkeyopts = sk_OPENSSL_STRING_new_null();
+                        if (!pkeyopts || !sk_OPENSSL_STRING_push(pkeyopts, *(++argv)))
+                                goto bad;
+                        }
                 else if (strcmp(*argv,"-batch") == 0)
                         batch=1;
                 else if (strcmp(*argv,"-newhdr") == 0)
                         newhdr=1;
                 else if (strcmp(*argv,"-modulus") == 0)
                         modulus=1;
                 else if (strcmp(*argv,"-verify") == 0)
                         verify=1;
                 else if (strcmp(*argv,"-nodes") == 0)
                         nodes=1;
@@ skipping 35 matching lines @@
                         if (--argc < 1) goto bad;
                         days= atoi(*(++argv));
                         if (days == 0) days=30;
                         }
                 else if (strcmp(*argv,"-set_serial") == 0)
                         {
                         if (--argc < 1) goto bad;
                         serial = s2i_ASN1_INTEGER(NULL, *(++argv));
                         if (!serial) goto bad;
                         }
-                else if ((md_alg=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
-                        {
-                        /* ok */
-                        digest=md_alg;
-                        }
                 else if (strcmp(*argv,"-extensions") == 0)
                         {
                         if (--argc < 1) goto bad;
                         extensions = *(++argv);
                         }
                 else if (strcmp(*argv,"-reqexts") == 0)
                         {
                         if (--argc < 1) goto bad;
                         req_exts = *(++argv);
                         }
+                else if ((md_alg=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
+                        {
+                        /* ok */
+                        digest=md_alg;
+                        }
                 else
                         {
                         BIO_printf(bio_err,"unknown option %s\n",*argv);
                         badops=1;
                         break;
                         }
                 argc--;
                 argv++;
                 }
 
@@ skipping 228 matching lines @@
                         {
                         char *randfile = NCONF_get_string(req_conf,SECTION,"RANDFILE");
                         if (randfile == NULL)
                                 ERR_clear_error();
                         app_RAND_load_file(randfile, bio_err, 0);
                         }
                 }
 
         if (newreq && (pkey == NULL))
                 {
-#ifndef OPENSSL_NO_RSA
-                BN_GENCB cb;
-#endif
                 char *randfile = NCONF_get_string(req_conf,SECTION,"RANDFILE");
                 if (randfile == NULL)
                         ERR_clear_error();
                 app_RAND_load_file(randfile, bio_err, 0);
                 if (inrand)
                         app_RAND_load_files(inrand);
+
+                if (keyalg)
+                        {
+                        genctx = set_keygen_ctx(bio_err, keyalg, &pkey_type, &newkey,
+                                                        &keyalgstr, gen_eng);
+                        if (!genctx)
+                                goto end;
+                        }
         
                 if (newkey <= 0)
                         {
                         if (!NCONF_get_number(req_conf,SECTION,BITS, &newkey))
                                 newkey=DEFAULT_KEY_LENGTH;
                         }
 
-                if (newkey < MIN_KEY_LENGTH && (pkey_type == TYPE_RSA || pkey_type == TYPE_DSA))
+                if (newkey < MIN_KEY_LENGTH && (pkey_type == EVP_PKEY_RSA || pkey_type == EVP_PKEY_DSA))
                         {
                         BIO_printf(bio_err,"private key length is too short,\n");
                         BIO_printf(bio_err,"it needs to be at least %d bits, not %ld\n",MIN_KEY_LENGTH,newkey);
                         goto end;
                         }
+
+                if (!genctx)
+                        {
+                        genctx = set_keygen_ctx(bio_err, NULL, &pkey_type, &newkey,
+                                                        &keyalgstr, gen_eng);
+                        if (!genctx)
+                                goto end;
+                        }
+
+                if (pkeyopts)
+                        {
+                        char *genopt;
+                        for (i = 0; i < sk_OPENSSL_STRING_num(pkeyopts); i++)
+                                {
+                                genopt = sk_OPENSSL_STRING_value(pkeyopts, i);
+                                if (pkey_ctrl_string(genctx, genopt) <= 0)
+                                        {
+                                        BIO_printf(bio_err,
+                                                "parameter error \"%s\"\n",
+                                                genopt);
+                                        ERR_print_errors(bio_err);
+                                        goto end;
+                                        }
+                                }
+                        }
+
                 BIO_printf(bio_err,"Generating a %ld bit %s private key\n",
-                        newkey,(pkey_type == TYPE_RSA)?"RSA":
-                        (pkey_type == TYPE_DSA)?"DSA":"EC");
+                                newkey, keyalgstr);
 
-                if ((pkey=EVP_PKEY_new()) == NULL) goto end;
+                EVP_PKEY_CTX_set_cb(genctx, genpkey_cb);
+                EVP_PKEY_CTX_set_app_data(genctx, bio_err);
 
-#ifndef OPENSSL_NO_RSA
-                BN_GENCB_set(&cb, req_cb, bio_err);
-                if (pkey_type == TYPE_RSA)
+                if (EVP_PKEY_keygen(genctx, &pkey) <= 0)
                         {
-                        RSA *rsa = RSA_new();
-                        BIGNUM *bn = BN_new();
-                        if(!bn || !rsa || !BN_set_word(bn, 0x10001) ||
-                                        !RSA_generate_key_ex(rsa, newkey, bn, &cb) ||
-                                        !EVP_PKEY_assign_RSA(pkey, rsa))
-                                {
-                                if(bn) BN_free(bn);
-                                if(rsa) RSA_free(rsa);
-                                goto end;
-                                }
-                        BN_free(bn);
+                        BIO_puts(bio_err, "Error Generating Key\n");
+                        goto end;
                         }
-                else
-#endif
-#ifndef OPENSSL_NO_DSA
-                        if (pkey_type == TYPE_DSA)
-                        {
-                        if (!DSA_generate_key(dsa_params)) goto end;
-                        if (!EVP_PKEY_assign_DSA(pkey,dsa_params)) goto end;
-                        dsa_params=NULL;
-                        }
-#endif
-#ifndef OPENSSL_NO_ECDSA
-                        if (pkey_type == TYPE_EC)
-                        {
-                        if (!EC_KEY_generate_key(ec_params)) goto end;
-                        if (!EVP_PKEY_assign_EC_KEY(pkey, ec_params)) 
-                                goto end;
-                        ec_params = NULL;
-                        }
-#endif
+
+                EVP_PKEY_CTX_free(genctx);
+                genctx = NULL;
 
                 app_RAND_write_file(randfile, bio_err);
 
-                if (pkey == NULL) goto end;
-
                 if (keyout == NULL)
                         {
                         keyout=NCONF_get_string(req_conf,SECTION,KEYFILE);
                         if (keyout == NULL)
                                 ERR_clear_error();
                         }
                 
                 if (keyout == NULL)
                         {
                         BIO_printf(bio_err,"writing new private key to stdout\n");
@@ skipping 77 matching lines @@
                         }
                 }
 
         if (newreq || x509)
                 {
                 if (pkey == NULL)
                         {
                         BIO_printf(bio_err,"you need to specify a private key\n");
                         goto end;
                         }
-#ifndef OPENSSL_NO_DSA
-                if (pkey->type == EVP_PKEY_DSA)
-                        digest=EVP_dss1();
-#endif
-#ifndef OPENSSL_NO_ECDSA
-                if (pkey->type == EVP_PKEY_EC)
-                        digest=EVP_ecdsa();
-#endif
+
                 if (req == NULL)
                         {
                         req=X509_REQ_new();
                         if (req == NULL)
                                 {
                                 goto end;
                                 }
 
                         i=make_REQ(req,pkey,subj,multirdn,!x509, chtype);
                         subj=NULL; /* done processing '-subj' option */
@@ skipping 22 matching lines @@
                                 }
                         else
                                 {
                                 if (!rand_serial(NULL,
                                         X509_get_serialNumber(x509ss)))
                                                 goto end;
                                 }
 
                         if (!X509_set_issuer_name(x509ss, X509_REQ_get_subject_name(req))) goto end;
                         if (!X509_gmtime_adj(X509_get_notBefore(x509ss),0)) goto end;
-                        if (!X509_gmtime_adj(X509_get_notAfter(x509ss), (long)60*60*24*days)) goto end;
+                        if (!X509_time_adj_ex(X509_get_notAfter(x509ss), days, 0, NULL)) goto end;
                         if (!X509_set_subject_name(x509ss, X509_REQ_get_subject_name(req))) goto end;
                         tmppkey = X509_REQ_get_pubkey(req);
                         if (!tmppkey || !X509_set_pubkey(x509ss,tmppkey)) goto end;
                         EVP_PKEY_free(tmppkey);
 
                         /* Set up V3 context struct */
 
                         X509V3_set_ctx(&ext_ctx, x509ss, x509ss, NULL, NULL, 0);
                         X509V3_set_nconf(&ext_ctx, req_conf);
 
                         /* Add extensions */
                         if(extensions && !X509V3_EXT_add_nconf(req_conf, 
                                         &ext_ctx, extensions, x509ss))
                                 {
                                 BIO_printf(bio_err,
                                         "Error Loading extension section %s\n",
                                         extensions);
                                 goto end;
                                 }
                         
                         if (!(i=X509_sign(x509ss,pkey,digest)))
+                                {
+                                ERR_print_errors(bio_err);
                                 goto end;
+                                }
                         }
                 else
                         {
                         X509V3_CTX ext_ctx;
 
                         /* Set up V3 context struct */
 
                         X509V3_set_ctx(&ext_ctx, NULL, NULL, req, NULL, 0);
                         X509V3_set_nconf(&ext_ctx, req_conf);
 
                         /* Add extensions */
                         if(req_exts && !X509V3_EXT_REQ_add_nconf(req_conf, 
                                         &ext_ctx, req_exts, req))
                                 {
                                 BIO_printf(bio_err,
                                         "Error Loading extension section %s\n",
                                         req_exts);
                                 goto end;
                                 }
                         if (!(i=X509_REQ_sign(req,pkey,digest)))
+                                {
+                                ERR_print_errors(bio_err);
                                 goto end;
+                                }
                         }
                 }
 
         if (subj && x509)
                 {
                 BIO_printf(bio_err, "Cannot modifiy certificate subject\n");
                 goto end;
                 }
 
         if (subj && !x509)
@@ skipping 116 matching lines @@
                         tpubkey=X509_get_pubkey(x509ss);
                 else
                         tpubkey=X509_REQ_get_pubkey(req);
                 if (tpubkey == NULL)
                         {
                         fprintf(stdout,"Modulus=unavailable\n");
                         goto end; 
                         }
                 fprintf(stdout,"Modulus=");
 #ifndef OPENSSL_NO_RSA
-                if (tpubkey->type == EVP_PKEY_RSA)
+                if (EVP_PKEY_base_id(tpubkey) == EVP_PKEY_RSA)
                         BN_print(out,tpubkey->pkey.rsa->n);
                 else
 #endif
                         fprintf(stdout,"Wrong Algorithm type");
                 EVP_PKEY_free(tpubkey);
                 fprintf(stdout,"\n");
                 }
 
         if (!noout && !x509)
                 {
@@ skipping 35 matching lines @@
                 OPENSSL_free(to_free);
 #endif
         if (ex)
                 {
                 ERR_print_errors(bio_err);
                 }
         if ((req_conf != NULL) && (req_conf != config)) NCONF_free(req_conf);
         BIO_free(in);
         BIO_free_all(out);
         EVP_PKEY_free(pkey);
+        if (genctx)
+                EVP_PKEY_CTX_free(genctx);
+        if (pkeyopts)
+                sk_OPENSSL_STRING_free(pkeyopts);
+#ifndef OPENSSL_NO_ENGINE
+        if (gen_eng)
+                ENGINE_free(gen_eng);
+#endif
+        if (keyalgstr)
+                OPENSSL_free(keyalgstr);
         X509_REQ_free(req);
         X509_free(x509ss);
         ASN1_INTEGER_free(serial);
         if(passargin && passin) OPENSSL_free(passin);
         if(passargout && passout) OPENSSL_free(passout);
         OBJ_cleanup();
-#ifndef OPENSSL_NO_DSA
-        if (dsa_params != NULL) DSA_free(dsa_params);
-#endif
-#ifndef OPENSSL_NO_ECDSA
-        if (ec_params != NULL) EC_KEY_free(ec_params);
-#endif
         apps_shutdown();
         OPENSSL_EXIT(ex);
         }
 
 static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *subj, int multirdn,
                         int attribs, unsigned long chtype)
         {
         int ret=0,i;
         char no_prompt = 0;
         STACK_OF(CONF_VALUE) *dn_sk, *attr_sk = NULL;
@@ skipping 434 matching lines @@
                 BIO_printf(bio_err, "Error adding attribute\n");
                 ERR_print_errors(bio_err);
                 goto err;
         }
 
         return(1);
 err:
         return(0);
         }
 
-#ifndef OPENSSL_NO_RSA
-static int MS_CALLBACK req_cb(int p, int n, BN_GENCB *cb)
-        {
-        char c='*';
-
-        if (p == 0) c='.';
-        if (p == 1) c='+';
-        if (p == 2) c='*';
-        if (p == 3) c='\n';
-        BIO_write(cb->arg,&c,1);
-        (void)BIO_flush(cb->arg);
-#ifdef LINT
-        p=n;
-#endif
-        return 1;
-        }
-#endif
-
 static int req_check_len(int len, int n_min, int n_max)
         {
         if ((n_min > 0) && (len < n_min))
                 {
                 BIO_printf(bio_err,"string is too short, it needs to be at least %d bytes long\n",n_min);
                 return(0);
                 }
         if ((n_max >= 0) && (len > n_max))
                 {
                 BIO_printf(bio_err,"string is too long, it needs to be less than  %d bytes long\n",n_max);
                 return(0);
                 }
         return(1);
         }
 
 /* Check if the end of a string matches 'end' */
 static int check_end(const char *str, const char *end)
 {
         int elen, slen; 
         const char *tmp;
         elen = strlen(end);
         slen = strlen(str);
         if(elen > slen) return 1;
         tmp = str + slen - elen;
         return strcmp(tmp, end);
 }
+
+static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr, int *pkey_type,
+                                        long *pkeylen, char **palgnam,
+                                        ENGINE *keygen_engine)
+        {
+        EVP_PKEY_CTX *gctx = NULL;
+        EVP_PKEY *param = NULL;
+        long keylen = -1;
+        BIO *pbio = NULL;
+        const char *paramfile = NULL;
+
+        if (gstr == NULL)
+                {
+                *pkey_type = EVP_PKEY_RSA;
+                keylen = *pkeylen;
+                }
+        else if (gstr[0] >= '0' && gstr[0] <= '9')
+                {
+                *pkey_type = EVP_PKEY_RSA;
+                keylen = atol(gstr);
+                *pkeylen = keylen;
+                }
+        else if (!strncmp(gstr, "param:", 6))
+                paramfile = gstr + 6;
+        else
+                {
+                const char *p = strchr(gstr, ':');
+                int len;
+                ENGINE *tmpeng;
+                const EVP_PKEY_ASN1_METHOD *ameth;
+
+                if (p)
+                        len = p - gstr;
+                else
+                        len = strlen(gstr);
+                /* The lookup of a the string will cover all engines so
+                 * keep a note of the implementation.
+                 */
+
+                ameth = EVP_PKEY_asn1_find_str(&tmpeng, gstr, len);
+
+                if (!ameth)
+                        {
+                        BIO_printf(err, "Unknown algorithm %.*s\n", len, gstr);
+                        return NULL;
+                        }
+
+                EVP_PKEY_asn1_get0_info(NULL, pkey_type, NULL, NULL, NULL,
+                                                                        ameth);
+#ifndef OPENSSL_NO_ENGINE
+                if (tmpeng)
+                        ENGINE_finish(tmpeng);
+#endif
+                if (*pkey_type == EVP_PKEY_RSA)
+                        {
+                        if (p)
+                                {
+                                keylen = atol(p + 1);
+                                *pkeylen = keylen;
+                                }
+                        }
+                else if (p)
+                        paramfile = p + 1;
+                }
+
+        if (paramfile)
+                {
+                pbio = BIO_new_file(paramfile, "r");
+                if (!pbio)
+                        {
+                        BIO_printf(err, "Can't open parameter file %s\n",
+                                        paramfile);
+                        return NULL;
+                        }
+                param = PEM_read_bio_Parameters(pbio, NULL);
+
+                if (!param)
+                        {
+                        X509 *x;
+                        (void)BIO_reset(pbio);
+                        x = PEM_read_bio_X509(pbio, NULL, NULL, NULL);
+                        if (x)
+                                {
+                                param = X509_get_pubkey(x);
+                                X509_free(x);
+                                }
+                        }
+
+                BIO_free(pbio);
+
+                if (!param)
+                        {
+                        BIO_printf(err, "Error reading parameter file %s\n",
+                                        paramfile);
+                        return NULL;
+                        }
+                if (*pkey_type == -1)
+                        *pkey_type = EVP_PKEY_id(param);
+                else if (*pkey_type != EVP_PKEY_base_id(param))
+                        {
+                        BIO_printf(err, "Key Type does not match parameters\n");
+                        EVP_PKEY_free(param);
+                        return NULL;
+                        }
+                }
+
+        if (palgnam)
+                {
+                const EVP_PKEY_ASN1_METHOD *ameth;
+                ENGINE *tmpeng;
+                const char *anam;
+                ameth = EVP_PKEY_asn1_find(&tmpeng, *pkey_type);
+                if (!ameth)
+                        {
+                        BIO_puts(err, "Internal error: can't find key algorithm\n");
+                        return NULL;
+                        }
+                EVP_PKEY_asn1_get0_info(NULL, NULL, NULL, NULL, &anam, ameth);
+                *palgnam = BUF_strdup(anam);
+#ifndef OPENSSL_NO_ENGINE
+                if (tmpeng)
+                        ENGINE_finish(tmpeng);
+#endif
+                }
+
+        if (param)
+                {
+                gctx = EVP_PKEY_CTX_new(param, keygen_engine);
+                *pkeylen = EVP_PKEY_bits(param);
+                EVP_PKEY_free(param);
+                }
+        else
+                gctx = EVP_PKEY_CTX_new_id(*pkey_type, keygen_engine);
+
+        if (!gctx)
+                {
+                BIO_puts(err, "Error allocating keygen context\n");
+                ERR_print_errors(err);
+                return NULL;
+                }
+
+        if (EVP_PKEY_keygen_init(gctx) <= 0)
+                {
+                BIO_puts(err, "Error initializing keygen context\n");
+                ERR_print_errors(err);
+                return NULL;
+                }
+#ifndef OPENSSL_NO_RSA
+        if ((*pkey_type == EVP_PKEY_RSA) && (keylen != -1))
+                {
+                if (EVP_PKEY_CTX_set_rsa_keygen_bits(gctx, keylen) <= 0)
+                        {
+                        BIO_puts(err, "Error setting RSA keysize\n");
+                        ERR_print_errors(err);
+                        EVP_PKEY_CTX_free(gctx);
+                        return NULL;
+                        }
+                }
+#endif
+
+        return gctx;
+        }
+
+static int genpkey_cb(EVP_PKEY_CTX *ctx)
+        {
+        char c='*';
+        BIO *b = EVP_PKEY_CTX_get_app_data(ctx);
+        int p;
+        p = EVP_PKEY_CTX_get_keygen_info(ctx, 0);
+        if (p == 0) c='.';
+        if (p == 1) c='+';
+        if (p == 2) c='*';
+        if (p == 3) c='\n';
+        BIO_write(b,&c,1);
+        (void)BIO_flush(b);
+#ifdef LINT
+        p=n;
+#endif
+        return 1;
+        }