diff options
author | tb <> | 2023-07-28 09:28:37 +0000 |
---|---|---|
committer | tb <> | 2023-07-28 09:28:37 +0000 |
commit | 33dbb14462f6ae315b78289dc98d9434aff69e79 (patch) | |
tree | 7caeb4b66ea3545dbbf75224b3b77f6e29ea4f22 /src/lib/libcrypto/ec/ec_err.c | |
parent | cf0c598c9887e5bc98b6596c5e1e0dda9848b88d (diff) | |
download | openbsd-33dbb14462f6ae315b78289dc98d9434aff69e79.tar.gz openbsd-33dbb14462f6ae315b78289dc98d9434aff69e79.tar.bz2 openbsd-33dbb14462f6ae315b78289dc98d9434aff69e79.zip |
Move KDF handling to ECDH_compute_key()
In OpenSSL e2285d87, the KDF handling was moved from the compute_key()
method into the public API. A consequence of this change is that the
ECDH_compute_key() API no longer returns -1 for some errors. Existing
checks for <= 0 are safe as are those checking for the exact length as
return value, which is all what the ecosystem seems to be doing.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/ec/ec_err.c')
-rw-r--r-- | src/lib/libcrypto/ec/ec_err.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/ec/ec_err.c b/src/lib/libcrypto/ec/ec_err.c index d797b937c2..9f2253dddd 100644 --- a/src/lib/libcrypto/ec/ec_err.c +++ b/src/lib/libcrypto/ec/ec_err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_err.c,v 1.17 2023/07/07 13:54:45 beck Exp $ */ | 1 | /* $OpenBSD: ec_err.c,v 1.18 2023/07/28 09:28:37 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -98,6 +98,7 @@ static ERR_STRING_DATA EC_str_reasons[] = | |||
98 | {ERR_REASON(EC_R_INVALID_FORM), "invalid form"}, | 98 | {ERR_REASON(EC_R_INVALID_FORM), "invalid form"}, |
99 | {ERR_REASON(EC_R_INVALID_GROUP_ORDER), "invalid group order"}, | 99 | {ERR_REASON(EC_R_INVALID_GROUP_ORDER), "invalid group order"}, |
100 | {ERR_REASON(EC_R_INVALID_KEY), "invalid key"}, | 100 | {ERR_REASON(EC_R_INVALID_KEY), "invalid key"}, |
101 | {ERR_REASON(EC_R_INVALID_OUTPUT_LENGTH), "invalid output length"}, | ||
101 | {ERR_REASON(EC_R_INVALID_PEER_KEY), "invalid peer key"}, | 102 | {ERR_REASON(EC_R_INVALID_PEER_KEY), "invalid peer key"}, |
102 | {ERR_REASON(EC_R_INVALID_PENTANOMIAL_BASIS), "invalid pentanomial basis"}, | 103 | {ERR_REASON(EC_R_INVALID_PENTANOMIAL_BASIS), "invalid pentanomial basis"}, |
103 | {ERR_REASON(EC_R_INVALID_PRIVATE_KEY), "invalid private key"}, | 104 | {ERR_REASON(EC_R_INVALID_PRIVATE_KEY), "invalid private key"}, |