summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2004-12-30 11:10:11 +0000
committerAndy Polyakov <appro@openssl.org>2004-12-30 11:10:11 +0000
commit3ffb8d42bce2056de9e41dd03176332337b02eaa (patch)
tree85ad63b358d929cd064ec02f41caac9b42e71fe2
parent25866e39822a23e97ba390d60e893faff2fe0a62 (diff)
downloadopenssl-new-3ffb8d42bce2056de9e41dd03176332337b02eaa.tar.gz
Remove naming conflict between variable and label.
-rw-r--r--apps/apps.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/apps.c b/apps/apps.c
index e08c4bdeba..1bcebc749a 100644
--- 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);
- goto err;
+ goto die;
}
/* 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);
- goto err;
+ goto die;
}
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);
- goto err;
+ goto die;
}
pass = tpass;
}
ret = PKCS12_parse(p12, pass, pkey, cert, ca);
- err:
+ die:
if (p12)
PKCS12_free(p12);
return ret;