From 4052e1de4c81ad7718a29e331cc7f3eba12e9e40 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 15 Nov 2017 16:19:15 +0000 Subject: [PATCH] Remove some deprecated curve 448 code and remove some unneeded defines Reviewed-by: Bernd Edlinger (Merged from https://github.com/openssl/openssl/pull/5105) --- crypto/ec/curve448/decaf.c | 7 ------- crypto/ec/curve448/decaf/common.h | 8 -------- crypto/ec/curve448/point_448.h | 15 --------------- 3 files changed, 30 deletions(-) diff --git a/crypto/ec/curve448/decaf.c b/crypto/ec/curve448/decaf.c index 9f01454b40..bbee4b022e 100644 --- a/crypto/ec/curve448/decaf.c +++ b/crypto/ec/curve448/decaf.c @@ -1345,13 +1345,6 @@ void decaf_ed448_convert_public_key_to_x448 ( } } -void decaf_x448_generate_key ( - uint8_t out[X_PUBLIC_BYTES], - const uint8_t scalar[X_PRIVATE_BYTES] -) { - decaf_x448_derive_public_key(out,scalar); -} - void API_NS(point_mul_by_ratio_and_encode_like_x448) ( uint8_t out[X_PUBLIC_BYTES], const point_t p diff --git a/crypto/ec/curve448/decaf/common.h b/crypto/ec/curve448/decaf/common.h index 64719ad971..a9d10cffa8 100644 --- a/crypto/ec/curve448/decaf/common.h +++ b/crypto/ec/curve448/decaf/common.h @@ -29,14 +29,6 @@ extern "C" { #define DECAF_WARN_UNUSED __attribute__((warn_unused_result)) #define DECAF_NONNULL __attribute__((nonnull)) #define DECAF_INLINE inline __attribute__((always_inline,unused)) -// Cribbed from libnotmuch -#if defined (__clang_major__) && __clang_major__ >= 3 \ - || defined (__GNUC__) && __GNUC__ >= 5 \ - || defined (__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ >= 5 -#define DECAF_DEPRECATED(msg) __attribute__ ((deprecated(msg))) -#else -#define DECAF_DEPRECATED(msg) __attribute__ ((deprecated)) -#endif /** @endcond */ /* Internal word types. diff --git a/crypto/ec/curve448/point_448.h b/crypto/ec/curve448/point_448.h index bc1cb43a00..1757129e84 100644 --- a/crypto/ec/curve448/point_448.h +++ b/crypto/ec/curve448/point_448.h @@ -430,21 +430,6 @@ void decaf_448_point_mul_by_ratio_and_encode_like_x448 ( /** The base point for X448 Diffie-Hellman */ extern const uint8_t decaf_x448_base_point[DECAF_X448_PUBLIC_BYTES] DECAF_API_VIS; - -/** - * @brief RFC 7748 Diffie-Hellman base point scalarmul. This function uses - * a different (non-Decaf) encoding. - * - * @deprecated Renamed to decaf_x448_derive_public_key. - * I have no particular timeline for removing this name. - * - * @param [out] scaled The scaled point base*scalar - * @param [in] scalar The scalar to multiply by. - */ -void decaf_x448_generate_key ( - uint8_t out[DECAF_X448_PUBLIC_BYTES], - const uint8_t scalar[DECAF_X448_PRIVATE_BYTES] -) DECAF_API_VIS DECAF_NONNULL DECAF_NOINLINE DECAF_DEPRECATED("Renamed to decaf_x448_derive_public_key"); /** * @brief RFC 7748 Diffie-Hellman base point scalarmul. This function uses -- 2.25.1