summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ec/eck_prn.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/ec/eck_prn.c')
-rw-r--r--src/lib/libcrypto/ec/eck_prn.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/src/lib/libcrypto/ec/eck_prn.c b/src/lib/libcrypto/ec/eck_prn.c
index b17908d7fa..c2fd2ebc85 100644
--- a/src/lib/libcrypto/ec/eck_prn.c
+++ b/src/lib/libcrypto/ec/eck_prn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: eck_prn.c,v 1.16 2021/04/20 17:04:13 tb Exp $ */ 1/* $OpenBSD: eck_prn.c,v 1.17 2021/04/20 17:12:43 tb Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -64,8 +64,6 @@
64#include <stdio.h> 64#include <stdio.h>
65#include <string.h> 65#include <string.h>
66 66
67#include <openssl/opensslconf.h>
68
69#include <openssl/bn.h> 67#include <openssl/bn.h>
70#include <openssl/ec.h> 68#include <openssl/ec.h>
71#include <openssl/err.h> 69#include <openssl/err.h>
@@ -214,19 +212,9 @@ ECPKParameters_print(BIO * bp, const EC_GROUP * x, int off)
214 reason = ERR_R_MALLOC_FAILURE; 212 reason = ERR_R_MALLOC_FAILURE;
215 goto err; 213 goto err;
216 } 214 }
217#ifndef OPENSSL_NO_EC2M 215 if (!EC_GROUP_get_curve(x, p, a, b, ctx)) {
218 if (is_char_two) { 216 reason = ERR_R_EC_LIB;
219 if (!EC_GROUP_get_curve(x, p, a, b, ctx)) { 217 goto err;
220 reason = ERR_R_EC_LIB;
221 goto err;
222 }
223 } else /* prime field */
224#endif
225 {
226 if (!EC_GROUP_get_curve(x, p, a, b, ctx)) {
227 reason = ERR_R_EC_LIB;
228 goto err;
229 }
230 } 218 }
231 219
232 if ((point = EC_GROUP_get0_generator(x)) == NULL) { 220 if ((point = EC_GROUP_get0_generator(x)) == NULL) {