blob: 23bb948b4c33769b78812432d4c13fc1f1d557e7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From 0472b6a95fa36257d0bf4ad99a14d437eedaa9ee Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@randombit.net>
Date: Tue, 17 Jul 2018 12:59:05 -0400
Subject: [PATCH] Handle another possible OpenSSL error only seen on non-x86_64
GH #1627
---
src/lib/prov/openssl/openssl_ec.cpp | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/lib/prov/openssl/openssl_ec.cpp b/src/lib/prov/openssl/openssl_ec.cpp
index ca5be857a5..b9e53b6fdc 100644
--- a/src/lib/prov/openssl/openssl_ec.cpp
+++ b/src/lib/prov/openssl/openssl_ec.cpp
@@ -187,15 +187,24 @@ class OpenSSL_ECDSA_Verification_Operation final : public PK_Ops::Verification_w
if(res < 0)
{
int err = ERR_get_error();
+
+ bool hard_error = true;
+
#if defined(EC_R_BAD_SIGNATURE)
- if(ERR_GET_REASON(err) != EC_R_BAD_SIGNATURE)
- throw OpenSSL_Error("ECDSA_do_verify", err);
-#elif defined(ECDSA_R_BAD_SIGNATURE)
- if(ERR_GET_REASON(err) != ECDSA_R_BAD_SIGNATURE)
- throw OpenSSL_Error("ECDSA_do_verify", err);
-#else
- throw OpenSSL_Error("ECDSA_do_verify");
+ if(ERR_GET_REASON(err) == EC_R_BAD_SIGNATURE)
+ hard_error = false;
#endif
+#if defined(EC_R_POINT_AT_INFINITY)
+ if(ERR_GET_REASON(err) == EC_R_POINT_AT_INFINITY)
+ hard_error = false;
+#endif
+#if defined(ECDSA_R_BAD_SIGNATURE)
+ if(ERR_GET_REASON(err) == ECDSA_R_BAD_SIGNATURE)
+ hard_error = false;
+#endif
+
+ if(hard_error)
+ throw OpenSSL_Error("ECDSA_do_verify", err);
}
return (res == 1);
}
|
