diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/t1_lib.c | 7 | 
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 | |||
| 216 | static int nid_list[] = { | 215 | static 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 | ||
| 248 | static const uint8_t ecformats_list[] = { | 248 | static 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 | ||
| 254 | static const uint8_t ecformats_default[] = { | 255 | static const uint8_t ecformats_default[] = { | 
| 255 | TLSEXT_ECPOINTFORMAT_uncompressed, | 256 | TLSEXT_ECPOINTFORMAT_uncompressed, | 
| 256 | }; | 257 | }; | 
| 257 | 258 | ||
| 259 | #if 0 | ||
| 258 | static const uint16_t eccurves_list[] = { | 260 | static 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 | ||
| 290 | static const uint16_t eccurves_default[] = { | 293 | static const uint16_t eccurves_default[] = { | 
| 291 | 29, /* X25519 (29) */ | 294 | 29, /* X25519 (29) */ | 
