generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a bug recently introduced when updating this file to use the new

Browse Source 
keygen API: make sure that 'pkey_type' is actually visible to MAIN().
This commit is contained in:
Bodo Möller 2006-06-14 01:16:22 +00:00
parent 1a159e08af
commit 6a983d4287
1 changed files with 15 additions and 16 deletions

31
apps/req.c

@ -144,7 +144,7 @@ static int add_DN_object(X509_NAME *n, char *text, const char *def, char *value,
static int genpkey_cb(EVP_PKEY_CTX *ctx); static int genpkey_cb(EVP_PKEY_CTX *ctx);
static int req_check_len(int len,int n_min,int n_max); static int req_check_len(int len,int n_min,int n_max);
static int check_end(const char *str, const char *end); static int check_end(const char *str, const char *end);
static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr, static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr, int *pkey_type,
long *pkeylen, char **palgnam, long *pkeylen, char **palgnam,
ENGINE *keygen_engine); ENGINE *keygen_engine);
#ifndef MONOLITH #ifndef MONOLITH
@ -167,7 +167,7 @@ int MAIN(int argc, char **argv)
char *keyalgstr = NULL; char *keyalgstr = NULL;
STACK *pkeyopts = NULL; STACK *pkeyopts = NULL;
EVP_PKEY *pkey=NULL; EVP_PKEY *pkey=NULL;
int i=0,badops=0,newreq=0,verbose=0,pkey_type=EVP_PKEY_RSA; int i=0,badops=0,newreq=0,verbose=0,pkey_type=-1;
long newkey = -1; long newkey = -1;
BIO *in=NULL,*out=NULL; BIO *in=NULL,*out=NULL;
int informat,outformat,verify=0,noout=0,text=0,keyform=FORMAT_PEM; int informat,outformat,verify=0,noout=0,text=0,keyform=FORMAT_PEM;
@ -638,7 +638,7 @@ bad:
if (keyalg) if (keyalg)
{ {
genctx = set_keygen_ctx(bio_err, keyalg, &newkey, genctx = set_keygen_ctx(bio_err, keyalg, &pkey_type, &newkey,
&keyalgstr, gen_eng); &keyalgstr, gen_eng);
if (!genctx) if (!genctx)
goto end; goto end;
@ -659,7 +659,7 @@ bad:
if (!genctx) if (!genctx)
{ {
genctx = set_keygen_ctx(bio_err, NULL, &newkey, genctx = set_keygen_ctx(bio_err, NULL, &pkey_type, &newkey,
&keyalgstr, gen_eng); &keyalgstr, gen_eng);
if (!genctx) if (!genctx)
goto end; goto end;
@ -1570,25 +1570,24 @@ static int check_end(const char *str, const char *end)
return strcmp(tmp, end); return strcmp(tmp, end);
} }
static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr, static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr, int *pkey_type,
long *pkeylen, char **palgnam, long *pkeylen, char **palgnam,
ENGINE *keygen_engine) ENGINE *keygen_engine)
{ {
EVP_PKEY_CTX *gctx = NULL; EVP_PKEY_CTX *gctx = NULL;
EVP_PKEY *param = NULL; EVP_PKEY *param = NULL;
long keylen = -1; long keylen = -1;
int pkey_type = -1;
BIO *pbio = NULL; BIO *pbio = NULL;
const char *paramfile = NULL; const char *paramfile = NULL;
if (gstr == NULL) if (gstr == NULL)
{ {
pkey_type = EVP_PKEY_RSA; *pkey_type = EVP_PKEY_RSA;
keylen = *pkeylen; keylen = *pkeylen;
} }
else if (gstr[0] >= '0' && gstr[0] <= '9') else if (gstr[0] >= '0' && gstr[0] <= '9')
{ {
pkey_type = EVP_PKEY_RSA; *pkey_type = EVP_PKEY_RSA;
keylen = atol(gstr); keylen = atol(gstr);
*pkeylen = keylen; *pkeylen = keylen;
} }
@ -1617,13 +1616,13 @@ static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr,
return NULL; return NULL;
} }
EVP_PKEY_asn1_get0_info(NULL, &pkey_type, NULL, NULL, NULL, EVP_PKEY_asn1_get0_info(NULL, pkey_type, NULL, NULL, NULL,
ameth); ameth);
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
if (tmpeng) if (tmpeng)
ENGINE_finish(tmpeng); ENGINE_finish(tmpeng);
#endif #endif
if (pkey_type == EVP_PKEY_RSA) if (*pkey_type == EVP_PKEY_RSA)
{ {
if (p) if (p)
{ {
@ -1666,9 +1665,9 @@ static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr,
paramfile); paramfile);
return NULL; return NULL;
} }
if (pkey_type == -1) if (*pkey_type == -1)
pkey_type = EVP_PKEY_id(param); *pkey_type = EVP_PKEY_id(param);
else if (pkey_type != EVP_PKEY_base_id(param)) else if (*pkey_type != EVP_PKEY_base_id(param))
{ {
BIO_printf(err, "Key Type does not match parameters\n"); BIO_printf(err, "Key Type does not match parameters\n");
EVP_PKEY_free(param); EVP_PKEY_free(param);
@ -1681,7 +1680,7 @@ static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr,
const EVP_PKEY_ASN1_METHOD *ameth; const EVP_PKEY_ASN1_METHOD *ameth;
ENGINE *tmpeng; ENGINE *tmpeng;
const char *anam; const char *anam;
ameth = EVP_PKEY_asn1_find(&tmpeng, pkey_type); ameth = EVP_PKEY_asn1_find(&tmpeng, *pkey_type);
if (!ameth) if (!ameth)
{ {
BIO_puts(err, "Internal error: can't find key algorithm\n"); BIO_puts(err, "Internal error: can't find key algorithm\n");
@ -1702,7 +1701,7 @@ static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr,
EVP_PKEY_free(param); EVP_PKEY_free(param);
} }
else else
gctx = EVP_PKEY_CTX_new_id(pkey_type, keygen_engine); gctx = EVP_PKEY_CTX_new_id(*pkey_type, keygen_engine);
if (!gctx) if (!gctx)
{ {
@ -1718,7 +1717,7 @@ static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr,
return NULL; return NULL;
} }
if ((pkey_type == EVP_PKEY_RSA) && (keylen != -1)) if ((*pkey_type == EVP_PKEY_RSA) && (keylen != -1))
{ {
if (EVP_PKEY_CTX_set_rsa_keygen_bits(gctx, keylen) <= 0) if (EVP_PKEY_CTX_set_rsa_keygen_bits(gctx, keylen) <= 0)
{ {