From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 17 Sep 2018 10:33:09 +0000 (+0200)
Subject: botan: Remove unnecessary nested blocks and simplify keyid allocation
X-Git-Tag: 5.7.0rc2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27885298276752fa615e0f2c89fbb20e15aa4466;p=thirdparty%2Fstrongswan.git

botan: Remove unnecessary nested blocks and simplify keyid allocation
---

diff --git a/src/libstrongswan/plugins/botan/botan_util.c b/src/libstrongswan/plugins/botan/botan_util.c
index a1d3529504..5e18405d7e 100644
--- a/src/libstrongswan/plugins/botan/botan_util.c
+++ b/src/libstrongswan/plugins/botan/botan_util.c
@@ -159,25 +159,15 @@ bool botan_get_fingerprint(botan_pubkey_t pubkey, void *cache,
 	switch (type)
 	{
 		case KEYID_PUBKEY_SHA1:
-		{
 			/* subjectPublicKey -> use botan_pubkey_fingerprint() */
-			fp->len = 0;
-			if (botan_pubkey_fingerprint(pubkey, "SHA-1", NULL, &fp->len)
-				!= BOTAN_FFI_ERROR_INSUFFICIENT_BUFFER_SPACE)
-			{
-				return FALSE;
-			}
-
-			*fp = chunk_alloc(fp->len);
+			*fp = chunk_alloc(HASH_SIZE_SHA1);
 			if (botan_pubkey_fingerprint(pubkey, "SHA-1", fp->ptr, &fp->len))
 			{
 				chunk_free(fp);
 				return FALSE;
 			}
 			break;
-		}
 		case KEYID_PUBKEY_INFO_SHA1:
-		{
 			/* subjectPublicKeyInfo -> use botan_pubkey_export(), then hash */
 			if (!botan_get_encoding(pubkey, PUBKEY_SPKI_ASN1_DER, &key))
 			{
@@ -196,7 +186,6 @@ bool botan_get_fingerprint(botan_pubkey_t pubkey, void *cache,
 			hasher->destroy(hasher);
 			chunk_free(&key);
 			break;
-		}
 		default:
 			return FALSE;
 	}