[27573] in CVS-changelog-for-Kerberos-V5
krb5 commit: Cleaner fix for #7570
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Fri Feb 15 14:29:15 2013
Date: Fri, 15 Feb 2013 14:29:10 -0500
From: Benjamin Kaduk <kaduk@mit.edu>
Message-Id: <201302151929.r1FJTACb029791@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/b71f8c4aacea8849ceaf31a2fa95e143f3943097
commit b71f8c4aacea8849ceaf31a2fa95e143f3943097
Author: Ben Kaduk <kaduk@mit.edu>
Date: Fri Feb 15 11:41:27 2013 -0500
Cleaner fix for #7570
Remove variables and labels which are no longer needed.
src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 6 ++----
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 827280b..6dbda9b 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
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
