diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:10:00 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:10:00 +0000 |
| commit | c869da8839ef5af9df5a4d98f518b079240a0d4b (patch) | |
| tree | 4993ede240e5c1851ad9c32f304ee9f650193173 /apps/req.c | |
| parent | d80866041ea4a5800a3f4a2ac4b83200eb8fd9c2 (diff) | |
Update from 1.0.0-stable
Diffstat (limited to 'apps/req.c')
| -rw-r--r-- | apps/req.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/req.c b/apps/req.c index e9b764b90c..b97a9f187b 100644 --- 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; - 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; @@ -306,8 +306,8 @@ int MAIN(int argc, char **argv) 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) @@ -667,9 +667,9 @@ bad: 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, @@ -1083,7 +1083,7 @@ end: 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); |