projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings (From HEAD, original patch by Ben).
[oweals/openssl.git]
/
apps
/
req.c
diff --git
a/apps/req.c
b/apps/req.c
index e728d5bf9511d6c501506393c2453fb42de1f210..820cd18fc70d02e3149560abaddb28fc9097ed2d 100644
(file)
--- a/
apps/req.c
+++ b/
apps/req.c
@@
-165,7
+165,7
@@
int MAIN(int argc, char **argv)
EVP_PKEY_CTX *genctx = NULL;
const char *keyalg = NULL;
char *keyalgstr = NULL;
EVP_PKEY_CTX *genctx = NULL;
const char *keyalg = NULL;
char *keyalgstr = NULL;
- STACK_OF(STRING) *pkeyopts = NULL;
+ STACK_OF(
OPENSSL_
STRING) *pkeyopts = NULL;
EVP_PKEY *pkey=NULL;
int i=0,badops=0,newreq=0,verbose=0,pkey_type=-1;
long newkey = -1;
EVP_PKEY *pkey=NULL;
int i=0,badops=0,newreq=0,verbose=0,pkey_type=-1;
long newkey = -1;
@@
-306,8
+306,8
@@
int MAIN(int argc, char **argv)
if (--argc < 1)
goto bad;
if (!pkeyopts)
if (--argc < 1)
goto bad;
if (!pkeyopts)
- pkeyopts = sk_STRING_new_null();
- if (!pkeyopts || !sk_STRING_push(pkeyopts, *(++argv)))
+ pkeyopts = sk_
OPENSSL_
STRING_new_null();
+ if (!pkeyopts || !sk_
OPENSSL_
STRING_push(pkeyopts, *(++argv)))
goto bad;
}
else if (strcmp(*argv,"-batch") == 0)
goto bad;
}
else if (strcmp(*argv,"-batch") == 0)
@@
-365,11
+365,6
@@
int MAIN(int argc, char **argv)
serial = s2i_ASN1_INTEGER(NULL, *(++argv));
if (!serial) 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;
else if (strcmp(*argv,"-extensions") == 0)
{
if (--argc < 1) goto bad;
@@
-380,6
+375,11
@@
int MAIN(int argc, char **argv)
if (--argc < 1) goto bad;
req_exts = *(++argv);
}
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);
else
{
BIO_printf(bio_err,"unknown option %s\n",*argv);
@@
-667,9
+667,9
@@
bad:
if (pkeyopts)
{
char *genopt;
if (pkeyopts)
{
char *genopt;
- for (i = 0; i < sk_STRING_num(pkeyopts); i++)
+ for (i = 0; i < sk_
OPENSSL_
STRING_num(pkeyopts); i++)
{
{
- genopt = sk_STRING_value(pkeyopts, i);
+ genopt = sk_
OPENSSL_
STRING_value(pkeyopts, i);
if (pkey_ctrl_string(genctx, genopt) <= 0)
{
BIO_printf(bio_err,
if (pkey_ctrl_string(genctx, genopt) <= 0)
{
BIO_printf(bio_err,
@@
-1083,7
+1083,7
@@
end:
if (genctx)
EVP_PKEY_CTX_free(genctx);
if (pkeyopts)
if (genctx)
EVP_PKEY_CTX_free(genctx);
if (pkeyopts)
- sk_STRING_free(pkeyopts);
+ sk_
OPENSSL_
STRING_free(pkeyopts);
#ifndef OPENSSL_NO_ENGINE
if (gen_eng)
ENGINE_free(gen_eng);
#ifndef OPENSSL_NO_ENGINE
if (gen_eng)
ENGINE_free(gen_eng);
@@
-1336,11
+1336,17
@@
start2: for (;;)
BIO_snprintf(buf,sizeof buf,"%s_min",type);
if (!NCONF_get_number(req_conf,attr_sect,buf, &n_min))
BIO_snprintf(buf,sizeof buf,"%s_min",type);
if (!NCONF_get_number(req_conf,attr_sect,buf, &n_min))
+ {
+ ERR_clear_error();
n_min = -1;
n_min = -1;
+ }
BIO_snprintf(buf,sizeof buf,"%s_max",type);
if (!NCONF_get_number(req_conf,attr_sect,buf, &n_max))
BIO_snprintf(buf,sizeof buf,"%s_max",type);
if (!NCONF_get_number(req_conf,attr_sect,buf, &n_max))
+ {
+ ERR_clear_error();
n_max = -1;
n_max = -1;
+ }
if (!add_attribute_object(req,
v->value,def,value,nid,n_min,n_max, chtype))
if (!add_attribute_object(req,
v->value,def,value,nid,n_min,n_max, chtype))
@@
-1441,7
+1447,8
@@
start:
buf[0]='\0';
if (!batch)
{
buf[0]='\0';
if (!batch)
{
- fgets(buf,sizeof buf,stdin);
+ if (!fgets(buf,sizeof buf,stdin))
+ return 0;
}
else
{
}
else
{
@@
-1499,7
+1506,8
@@
start:
buf[0]='\0';
if (!batch)
{
buf[0]='\0';
if (!batch)
{
- fgets(buf,sizeof buf,stdin);
+ if (!fgets(buf,sizeof buf,stdin))
+ return 0;
}
else
{
}
else
{
@@
-1715,7
+1723,7
@@
static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr, int *pkey_type,
ERR_print_errors(err);
return NULL;
}
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)
if ((*pkey_type == EVP_PKEY_RSA) && (keylen != -1))
{
if (EVP_PKEY_CTX_set_rsa_keygen_bits(gctx, keylen) <= 0)
@@
-1726,6
+1734,7
@@
static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr, int *pkey_type,
return NULL;
}
}
return NULL;
}
}
+#endif
return gctx;
}
return gctx;
}