summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2017-01-24 12:24:07 +0000
committerjsing <>2017-01-24 12:24:07 +0000
commitc3caeaff17135377a452ceab1e66432727fb25ba (patch)
tree2f32a115d878946560de1e2522ea6325e7162142
parent9892800ca50b1d9e0851acd562fd063fb879b461 (diff)
downloadopenbsd-c3caeaff17135377a452ceab1e66432727fb25ba.tar.gz
openbsd-c3caeaff17135377a452ceab1e66432727fb25ba.tar.bz2
openbsd-c3caeaff17135377a452ceab1e66432727fb25ba.zip
#if 0 the ecformats_list and eccurves_list - these are currently unused but
will be revisited at some point in the near future.
-rw-r--r--src/lib/libssl/t1_lib.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index be7c5b72a9..23e1a2d350 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_lib.c,v 1.109 2017/01/24 09:03:21 jsing Exp $ */ 1/* $OpenBSD: t1_lib.c,v 1.110 2017/01/24 12:24:07 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -212,7 +212,6 @@ tls1_clear(SSL *s)
212 s->version = s->method->internal->version; 212 s->version = s->method->internal->version;
213} 213}
214 214
215
216static int nid_list[] = { 215static int nid_list[] = {
217 NID_sect163k1, /* sect163k1 (1) */ 216 NID_sect163k1, /* sect163k1 (1) */
218 NID_sect163r1, /* sect163r1 (2) */ 217 NID_sect163r1, /* sect163r1 (2) */
@@ -245,16 +244,19 @@ static int nid_list[] = {
245 NID_X25519, /* X25519 (29) */ 244 NID_X25519, /* X25519 (29) */
246}; 245};
247 246
247#if 0
248static const uint8_t ecformats_list[] = { 248static const uint8_t ecformats_list[] = {
249 TLSEXT_ECPOINTFORMAT_uncompressed, 249 TLSEXT_ECPOINTFORMAT_uncompressed,
250 TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime, 250 TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime,
251 TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2 251 TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2
252}; 252};
253#endif
253 254
254static const uint8_t ecformats_default[] = { 255static const uint8_t ecformats_default[] = {
255 TLSEXT_ECPOINTFORMAT_uncompressed, 256 TLSEXT_ECPOINTFORMAT_uncompressed,
256}; 257};
257 258
259#if 0
258static const uint16_t eccurves_list[] = { 260static const uint16_t eccurves_list[] = {
259 29, /* X25519 (29) */ 261 29, /* X25519 (29) */
260 14, /* sect571r1 (14) */ 262 14, /* sect571r1 (14) */
@@ -286,6 +288,7 @@ static const uint16_t eccurves_list[] = {
286 16, /* secp160r1 (16) */ 288 16, /* secp160r1 (16) */
287 17, /* secp160r2 (17) */ 289 17, /* secp160r2 (17) */
288}; 290};
291#endif
289 292
290static const uint16_t eccurves_default[] = { 293static const uint16_t eccurves_default[] = {
291 29, /* X25519 (29) */ 294 29, /* X25519 (29) */