diff options
| author | Pauli <paul.dale@oracle.com> | 2019-06-21 09:27:48 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-06-21 10:03:55 +1000 |
| commit | 32ee452496f8cf4558d645f9db908b09df919f04 (patch) | |
| tree | 0fa688bcaff971eb4124f6142c5e4ef08482c2bb /crypto/ec/ec_curve.c | |
| parent | 2d905f6715453034d1f942a0237b0d2b9d57326c (diff) | |
Remove OPENSSL_memcmp.
After avoiding OPENSSL_memcmp for EC curve comparison, there are no remaining
uses in the source code. The function is only defined in an internal header
and thus should be safe to remove for 3.0.0.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/9207)
Diffstat (limited to 'crypto/ec/ec_curve.c')
| -rw-r--r-- | crypto/ec/ec_curve.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c index 6c7c9ddbc7..1ea85946d6 100644 --- a/crypto/ec/ec_curve.c +++ b/crypto/ec/ec_curve.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2019 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -14,7 +14,6 @@ #include <openssl/obj_mac.h> #include <openssl/opensslconf.h> #include "internal/nelem.h" -#include "internal/o_str.h" typedef struct { int field_type, /* either NID_X9_62_prime_field or @@ -3302,10 +3301,10 @@ int ec_curve_nid_from_params(const EC_GROUP *group) /* Check the optional seed (ignore if its not set) */ && (data->seed_len == 0 || seed_len == 0 || ((size_t)data->seed_len == seed_len - && OPENSSL_memcmp(params_seed, seed, seed_len) == 0)) + && memcmp(params_seed, seed, seed_len) == 0)) /* Check that the groups params match the built-in curve params */ - && OPENSSL_memcmp(param_bytes, params, param_len * NUM_BN_FIELDS) - == 0) { + && memcmp(param_bytes, params, param_len * NUM_BN_FIELDS) + == 0) { ret = curve.nid; goto end; } |