[openssl-commits] [openssl] master update
Emilia Kasper
emilia at openssl.org
Tue Feb 28 18:49:40 UTC 2017
The branch master has been updated
via d5aa14dde53d43ae08e4269f0e27222e824a40c2 (commit)
via c26f655fdd18ac19016c1c0496105f5256a1e84d (commit)
from a2b22cd6a857f249cae5d4eacb099d92e2ca3bea (commit)
- Log -----------------------------------------------------------------
commit d5aa14dde53d43ae08e4269f0e27222e824a40c2
Author: Emilia Kasper <emilia at openssl.org>
Date: Tue Feb 28 18:12:25 2017 +0100
Remove memcpy unrolling in bn_lib.c
Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Andy Polyakov <appro at openssl.org>
commit c26f655fdd18ac19016c1c0496105f5256a1e84d
Author: Emilia Kasper <emilia at openssl.org>
Date: Tue Feb 28 16:53:35 2017 +0100
Remove support for HMAC_TEST_PRIVATE_KEY_FORMAT
This is a bogus, undocumented format that was intended for testing; I
don't think anyone is using it.
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/bn/bn_lib.c | 90 ++++++--------------------------------------------
crypto/hmac/hm_ameth.c | 54 ------------------------------
2 files changed, 10 insertions(+), 134 deletions(-)
diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index 17d34c3..e61c870 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -245,9 +245,7 @@ BIGNUM *BN_new(void)
/* The caller MUST check that words > b->dmax before calling this */
static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words)
{
- BN_ULONG *A, *a = NULL;
- const BN_ULONG *B;
- int i;
+ BN_ULONG *a = NULL;
bn_check_top(b);
@@ -260,56 +258,18 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words)
return (NULL);
}
if (BN_get_flags(b, BN_FLG_SECURE))
- a = A = OPENSSL_secure_zalloc(words * sizeof(*a));
+ a = OPENSSL_secure_zalloc(words * sizeof(*a));
else
- a = A = OPENSSL_zalloc(words * sizeof(*a));
- if (A == NULL) {
+ a = OPENSSL_zalloc(words * sizeof(*a));
+ if (a == NULL) {
BNerr(BN_F_BN_EXPAND_INTERNAL, ERR_R_MALLOC_FAILURE);
return (NULL);
}
-#if 1
- B = b->d;
- /* Check if the previous number needs to be copied */
- if (B != NULL) {
- for (i = b->top >> 2; i > 0; i--, A += 4, B += 4) {
- /*
- * The fact that the loop is unrolled
- * 4-wise is a tribute to Intel. It's
- * the one that doesn't have enough
- * registers to accommodate more data.
- * I'd unroll it 8-wise otherwise:-)
- *
- * <appro at fy.chalmers.se>
- */
- BN_ULONG a0, a1, a2, a3;
- a0 = B[0];
- a1 = B[1];
- a2 = B[2];
- a3 = B[3];
- A[0] = a0;
- A[1] = a1;
- A[2] = a2;
- A[3] = a3;
- }
- switch (b->top & 3) {
- case 3:
- A[2] = B[2];
- case 2:
- A[1] = B[1];
- case 1:
- A[0] = B[0];
- case 0:
- /* Without the "case 0" some old optimizers got this wrong. */
- ;
- }
- }
-#else
- memset(A, 0, sizeof(*A) * words);
- memcpy(A, b->d, sizeof(b->d[0]) * b->top);
-#endif
+ assert(b->top <= words);
+ memcpy(a, b->d, sizeof(*a) * b->top);
- return (a);
+ return a;
}
/*
@@ -361,49 +321,19 @@ BIGNUM *BN_dup(const BIGNUM *a)
BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b)
{
- int i;
- BN_ULONG *A;
- const BN_ULONG *B;
-
bn_check_top(b);
if (a == b)
- return (a);
+ return a;
if (bn_wexpand(a, b->top) == NULL)
- return (NULL);
+ return NULL;
-#if 1
- A = a->d;
- B = b->d;
- for (i = b->top >> 2; i > 0; i--, A += 4, B += 4) {
- BN_ULONG a0, a1, a2, a3;
- a0 = B[0];
- a1 = B[1];
- a2 = B[2];
- a3 = B[3];
- A[0] = a0;
- A[1] = a1;
- A[2] = a2;
- A[3] = a3;
- }
- /* ultrix cc workaround, see comments in bn_expand_internal */
- switch (b->top & 3) {
- case 3:
- A[2] = B[2];
- case 2:
- A[1] = B[1];
- case 1:
- A[0] = B[0];
- case 0:;
- }
-#else
memcpy(a->d, b->d, sizeof(b->d[0]) * b->top);
-#endif
a->top = b->top;
a->neg = b->neg;
bn_check_top(a);
- return (a);
+ return a;
}
void BN_swap(BIGNUM *a, BIGNUM *b)
diff --git a/crypto/hmac/hm_ameth.c b/crypto/hmac/hm_ameth.c
index 78ae0ea..4d830b8 100644
--- a/crypto/hmac/hm_ameth.c
+++ b/crypto/hmac/hm_ameth.c
@@ -12,8 +12,6 @@
#include <openssl/evp.h>
#include "internal/asn1_int.h"
-#define HMAC_TEST_PRIVATE_KEY_FORMAT
-
/*
* HMAC "ASN1" method. This is just here to indicate the maximum HMAC output
* length and to free up an HMAC key.
@@ -51,53 +49,6 @@ static int hmac_pkey_public_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
return ASN1_OCTET_STRING_cmp(EVP_PKEY_get0(a), EVP_PKEY_get0(b));
}
-#ifdef HMAC_TEST_PRIVATE_KEY_FORMAT
-/*
- * A bogus private key format for test purposes. This is simply the HMAC key
- * with "HMAC PRIVATE KEY" in the headers. When enabled the genpkey utility
- * can be used to "generate" HMAC keys.
- */
-
-static int old_hmac_decode(EVP_PKEY *pkey,
- const unsigned char **pder, int derlen)
-{
- ASN1_OCTET_STRING *os;
- os = ASN1_OCTET_STRING_new();
- if (os == NULL || !ASN1_OCTET_STRING_set(os, *pder, derlen))
- goto err;
- if (!EVP_PKEY_assign(pkey, EVP_PKEY_HMAC, os))
- goto err;
- return 1;
-
- err:
- ASN1_OCTET_STRING_free(os);
- return 0;
-}
-
-static int old_hmac_encode(const EVP_PKEY *pkey, unsigned char **pder)
-{
- int inc;
- ASN1_OCTET_STRING *os = EVP_PKEY_get0(pkey);
- if (pder) {
- if (!*pder) {
- *pder = OPENSSL_malloc(os->length);
- if (*pder == NULL)
- return -1;
- inc = 0;
- } else
- inc = 1;
-
- memcpy(*pder, os->data, os->length);
-
- if (inc)
- *pder += os->length;
- }
-
- return os->length;
-}
-
-#endif
-
const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = {
EVP_PKEY_HMAC,
EVP_PKEY_HMAC,
@@ -116,10 +67,5 @@ const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = {
hmac_key_free,
hmac_pkey_ctrl,
-#ifdef HMAC_TEST_PRIVATE_KEY_FORMAT
- old_hmac_decode,
- old_hmac_encode
-#else
0, 0
-#endif
};
More information about the openssl-commits
mailing list