projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
25866e3
)
Remove naming conflict between variable and label.
author
Andy Polyakov
<appro@openssl.org>
Thu, 30 Dec 2004 11:10:11 +0000
(11:10 +0000)
committer
Andy Polyakov
<appro@openssl.org>
Thu, 30 Dec 2004 11:10:11 +0000
(11:10 +0000)
apps/apps.c
patch
|
blob
|
history
diff --git
a/apps/apps.c
b/apps/apps.c
index e08c4bdebaa78c0a0c709c828af1627ef45a1819..1bcebc749af5c13c5730eb2d23f7c8bb07a65554 100644
(file)
--- a/
apps/apps.c
+++ b/
apps/apps.c
@@
-700,7
+700,7
@@
static int load_pkcs12(BIO *err, BIO *in, const char *desc,
if (p12 == NULL)
{
BIO_printf(err, "Error loading PKCS12 file for %s\n", desc);
if (p12 == NULL)
{
BIO_printf(err, "Error loading PKCS12 file for %s\n", desc);
- goto
err
;
+ goto
die
;
}
/* See if an empty password will do */
if (PKCS12_verify_mac(p12, "", 0) || PKCS12_verify_mac(p12, NULL, 0))
}
/* See if an empty password will do */
if (PKCS12_verify_mac(p12, "", 0) || PKCS12_verify_mac(p12, NULL, 0))
@@
-714,7
+714,7
@@
static int load_pkcs12(BIO *err, BIO *in, const char *desc,
{
BIO_printf(err, "Passpharse callback error for %s\n",
desc);
{
BIO_printf(err, "Passpharse callback error for %s\n",
desc);
- goto
err
;
+ goto
die
;
}
if (len < PEM_BUFSIZE)
tpass[len] = 0;
}
if (len < PEM_BUFSIZE)
tpass[len] = 0;
@@
-722,12
+722,12
@@
static int load_pkcs12(BIO *err, BIO *in, const char *desc,
{
BIO_printf(err,
"Mac verify error (wrong password?) in PKCS12 file for %s\n", desc);
{
BIO_printf(err,
"Mac verify error (wrong password?) in PKCS12 file for %s\n", desc);
- goto
err
;
+ goto
die
;
}
pass = tpass;
}
ret = PKCS12_parse(p12, pass, pkey, cert, ca);
}
pass = tpass;
}
ret = PKCS12_parse(p12, pass, pkey, cert, ca);
-
err
:
+
die
:
if (p12)
PKCS12_free(p12);
return ret;
if (p12)
PKCS12_free(p12);
return ret;