krb5 commit [krb5-1.14]: Fix error handling in PKINIT decode_data()
Tom Yu <[email protected]>
| Newsgroups | gmane.comp.encryption.kerberos.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://github.com/krb5/krb5/commit/90197f0f4e7fc117a3b7546c7ca647cac7d5b668 commit 90197f0f4e7fc117a3b7546c7ca647cac7d5b668 Author: Greg Hudson <[email protected]> Date: Wed Dec 14 11:25:41 2016 -0500 Fix error handling in PKINIT decode_data() decode_data() mixes errno values with OpenSSL return codes. Change its return type to int, and return 1 on success or 0 on failure. (back ported from commit cc9035a7d25008bdcd9c7beb01670aa57b51d829) ticket: 8525 version_fixed: 1.14.5 src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c index 10e412f..de4ebc2 100644 --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c @@ -4028,24 +4028,24 @@ pkinit_sign_data(krb5_context context, } -static krb5_error_code +static int decode_data(unsigned char **out_data, unsigned int *out_data_len, unsigned char *data, unsigned int data_len, EVP_PKEY *pkey, X509 *cert) { - krb5_error_code retval = ENOMEM; + int retval; unsigned char *buf = NULL; int buf_len = 0; if (cert && !X509_check_private_key(cert, pkey)) { pkiDebug("private key does not match certificate\n"); - goto cleanup; + return 0; } buf_len = EVP_PKEY_size(pkey); buf = malloc((size_t) buf_len + 10); if (buf == NULL) - goto cleanup; + return 0; #if OPENSSL_VERSION_NUMBER >= 0x00909000L retval = EVP_PKEY_decrypt_old(buf, data, (int)data_len, pkey); @@ -4054,16 +4054,13 @@ decode_data(unsigned char **out_data, unsigned int *out_data_len, #endif if (retval <= 0) { pkiDebug("unable to decrypt received data (len=%d)\n", data_len); - goto cleanup; + free(buf); + return 0; } *out_data = buf; *out_data_len = retval; -cleanup: - if (retval == ENOMEM) - free(buf); - - return retval; + return 1; } static krb5_error_code