summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBen Kaduk <kaduk@mit.edu>2013-02-15 11:41:27 -0500
committerBen Kaduk <kaduk@mit.edu>2013-02-15 14:28:42 -0500
commitb71f8c4aacea8849ceaf31a2fa95e143f3943097 (patch)
tree358c4d4608633eb7a4ca326c6727d23e100e1576 /src
parentc773d3c775e9b2d88bcdff5f8a8ba88d7ec4e8ed (diff)
downloadkrb5-b71f8c4aacea8849ceaf31a2fa95e143f3943097.tar.gz
krb5-b71f8c4aacea8849ceaf31a2fa95e143f3943097.tar.xz
krb5-b71f8c4aacea8849ceaf31a2fa95e143f3943097.zip
Cleaner fix for #7570
Remove variables and labels which are no longer needed.
Diffstat (limited to 'src')
-rw-r--r--src/plugins/preauth/pkinit/pkinit_crypto_openssl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
index 827280b7c..6dbda9b1e 100644
--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
@@ -3243,7 +3243,6 @@ pkinit_check_kdc_pkid(krb5_context context,
unsigned int pkid_len,
int *valid_kdcPkId)
{
- krb5_error_code retval = KRB5KDC_ERR_PREAUTH_FAILED;
PKCS7_ISSUER_AND_SERIAL *is = NULL;
const unsigned char *p = pdid_buf;
int status = 1;
@@ -3253,7 +3252,7 @@ pkinit_check_kdc_pkid(krb5_context context,
pkiDebug("found kdcPkId in AS REQ\n");
is = d2i_PKCS7_ISSUER_AND_SERIAL(NULL, &p, (int)pkid_len);
if (is == NULL)
- return retval;
+ return KRB5KDC_ERR_PREAUTH_FAILED;
status = X509_NAME_cmp(X509_get_issuer_name(kdc_cert), is->issuer);
if (!status) {
@@ -3262,12 +3261,11 @@ pkinit_check_kdc_pkid(krb5_context context,
*valid_kdcPkId = 1;
}
- retval = 0;
X509_NAME_free(is->issuer);
ASN1_INTEGER_free(is->serial);
free(is);
- return retval;
+ return 0;
}
static int