[29889] in CVS-changelog-for-Kerberos-V5
krb5 commit: Remove some unnecessary PKINIT code
daemon@ATHENA.MIT.EDU (Greg Hudson)
Fri Mar 24 12:12:29 2017
Date: Fri, 24 Mar 2017 12:09:17 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201703241609.v2OG9HSQ028947@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/c02cdaf781328eb8c36bbea39c1d6b6581d70ae0
commit c02cdaf781328eb8c36bbea39c1d6b6581d70ae0
Author: Greg Hudson <ghudson@mit.edu>
Date: Thu Mar 23 14:26:50 2017 -0400
Remove some unnecessary PKINIT code
In cms_signeddata_create(), alg_buf and digest_buf are allocated but
never used. (Instead, a combined buffer is allocated and the alg and
digest objects are marshalled into it.) Remove them.
src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
index be4fc47..d8c80c1 100644
--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
@@ -1150,7 +1150,7 @@ cms_signeddata_create(krb5_context context,
X509_ALGOR *alg = NULL;
ASN1_OCTET_STRING *digest = NULL;
unsigned int alg_len = 0, digest_len = 0;
- unsigned char *y = NULL, *alg_buf = NULL, *digest_buf = NULL;
+ unsigned char *y = NULL;
X509 *cert = NULL;
ASN1_OBJECT *oid = NULL, *oid_copy;
@@ -1317,18 +1317,12 @@ cms_signeddata_create(krb5_context context,
goto cleanup2;
X509_ALGOR_set0(alg, OBJ_nid2obj(NID_sha1), V_ASN1_NULL, NULL);
alg_len = i2d_X509_ALGOR(alg, NULL);
- alg_buf = malloc(alg_len);
- if (alg_buf == NULL)
- goto cleanup2;
digest = ASN1_OCTET_STRING_new();
if (digest == NULL)
goto cleanup2;
ASN1_OCTET_STRING_set(digest, md_data2, (int)md_len2);
digest_len = i2d_ASN1_OCTET_STRING(digest, NULL);
- digest_buf = malloc(digest_len);
- if (digest_buf == NULL)
- goto cleanup2;
digestInfo_len = ASN1_object_size(1, (int)(alg_len + digest_len),
V_ASN1_SEQUENCE);
@@ -1417,9 +1411,7 @@ cleanup2:
#ifndef WITHOUT_PKCS11
if (id_cryptoctx->pkcs11_method == 1 &&
id_cryptoctx->mech == CKM_RSA_PKCS) {
- free(digest_buf);
free(digestInfo_buf);
- free(alg_buf);
if (digest != NULL)
ASN1_OCTET_STRING_free(digest);
}
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
