diff options
Diffstat (limited to 'src/lib/libcrypto/ec/ec_convert.c')
| -rw-r--r-- | src/lib/libcrypto/ec/ec_convert.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/ec/ec_convert.c b/src/lib/libcrypto/ec/ec_convert.c index a18bc49132..3b88bd20ba 100644 --- a/src/lib/libcrypto/ec/ec_convert.c +++ b/src/lib/libcrypto/ec/ec_convert.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ec_convert.c,v 1.14 2025/01/05 16:07:08 tb Exp $ */ | 1 | /* $OpenBSD: ec_convert.c,v 1.16 2025/12/26 18:44:19 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Originally written by Bodo Moeller for the OpenSSL project. | 3 | * Originally written by Bodo Moeller for the OpenSSL project. |
| 4 | */ | 4 | */ |
| @@ -64,10 +64,10 @@ | |||
| 64 | #include <string.h> | 64 | #include <string.h> |
| 65 | 65 | ||
| 66 | #include <openssl/asn1.h> | 66 | #include <openssl/asn1.h> |
| 67 | #include <openssl/err.h> | ||
| 68 | 67 | ||
| 69 | #include "asn1_local.h" | 68 | #include "asn1_local.h" |
| 70 | #include "ec_local.h" | 69 | #include "ec_local.h" |
| 70 | #include "err_local.h" | ||
| 71 | 71 | ||
| 72 | /* | 72 | /* |
| 73 | * Internal handling of the point conversion octet | 73 | * Internal handling of the point conversion octet |
| @@ -452,7 +452,7 @@ EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, | |||
| 452 | if (ctx == NULL) | 452 | if (ctx == NULL) |
| 453 | goto err; | 453 | goto err; |
| 454 | 454 | ||
| 455 | if (group->meth != point->meth) { | 455 | if (!ec_group_and_point_compatible(group, point)) { |
| 456 | ECerror(EC_R_INCOMPATIBLE_OBJECTS); | 456 | ECerror(EC_R_INCOMPATIBLE_OBJECTS); |
| 457 | goto err; | 457 | goto err; |
| 458 | } | 458 | } |
| @@ -478,7 +478,7 @@ EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point, | |||
| 478 | if (ctx == NULL) | 478 | if (ctx == NULL) |
| 479 | goto err; | 479 | goto err; |
| 480 | 480 | ||
| 481 | if (group->meth != point->meth) { | 481 | if (!ec_group_and_point_compatible(group, point)) { |
| 482 | ECerror(EC_R_INCOMPATIBLE_OBJECTS); | 482 | ECerror(EC_R_INCOMPATIBLE_OBJECTS); |
| 483 | goto err; | 483 | goto err; |
| 484 | } | 484 | } |
