projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0137833
)
Don't shadow.
author
Ben Laurie
<ben@openssl.org>
Wed, 28 Apr 1999 12:13:45 +0000
(12:13 +0000)
committer
Ben Laurie
<ben@openssl.org>
Wed, 28 Apr 1999 12:13:45 +0000
(12:13 +0000)
apps/x509.c
patch
|
blob
|
history
diff --git
a/apps/x509.c
b/apps/x509.c
index 210a25fb09b5cc62089b8379316c1d46567ca4e4..5434b53365ea391d6dac173cde607bc1ef69757a 100644
(file)
--- a/
apps/x509.c
+++ b/
apps/x509.c
@@
-323,7
+323,7
@@
bad:
if (extfile) {
long errorline;
if (extfile) {
long errorline;
- X509V3_CTX ctx;
+ X509V3_CTX ctx
2
;
if (!(extconf=CONF_load(NULL,extfile,&errorline))) {
if (errorline <= 0)
BIO_printf(bio_err,
if (!(extconf=CONF_load(NULL,extfile,&errorline))) {
if (errorline <= 0)
BIO_printf(bio_err,
@@
-337,9
+337,9
@@
bad:
}
if(!(extsect = CONF_get_string(extconf, "default",
"extensions"))) extsect = "default";
}
if(!(extsect = CONF_get_string(extconf, "default",
"extensions"))) extsect = "default";
- X509V3_set_ctx_test(&ctx);
- X509V3_set_conf_lhash(&ctx, extconf);
- if(!X509V3_EXT_add_conf(extconf, &ctx, extsect, NULL)) {
+ X509V3_set_ctx_test(&ctx
2
);
+ X509V3_set_conf_lhash(&ctx
2
, extconf);
+ if(!X509V3_EXT_add_conf(extconf, &ctx
2
, extsect, NULL)) {
BIO_printf(bio_err,
"Error Loading extension section %s\n",
extsect);
BIO_printf(bio_err,
"Error Loading extension section %s\n",
extsect);
@@
-868,11
+868,11
@@
static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest,
EVP_PKEY_free(upkey);
if(conf) {
EVP_PKEY_free(upkey);
if(conf) {
- X509V3_CTX ctx;
+ X509V3_CTX ctx
2
;
X509_set_version(x,2); /* version 3 certificate */
X509_set_version(x,2); /* version 3 certificate */
- X509V3_set_ctx(&ctx, xca, x, NULL, NULL, 0);
- X509V3_set_conf_lhash(&ctx, conf);
- if(!X509V3_EXT_add_conf(conf, &ctx, section, x)) goto end;
+ X509V3_set_ctx(&ctx
2
, xca, x, NULL, NULL, 0);
+ X509V3_set_conf_lhash(&ctx
2
, conf);
+ if(!X509V3_EXT_add_conf(conf, &ctx
2
, section, x)) goto end;
}
if (!X509_sign(x,pkey,digest)) goto end;
}
if (!X509_sign(x,pkey,digest)) goto end;