diff options
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 2a521fe26a..1b768e3939 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.129 2016/04/28 16:39:45 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.130 2016/10/19 16:38:40 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 | * |
@@ -255,8 +255,6 @@ | |||
255 | /* Bits for algorithm_mkey (key exchange algorithm) */ | 255 | /* Bits for algorithm_mkey (key exchange algorithm) */ |
256 | #define SSL_kRSA 0x00000001L /* RSA key exchange */ | 256 | #define SSL_kRSA 0x00000001L /* RSA key exchange */ |
257 | #define SSL_kDHE 0x00000008L /* tmp DH key no DH cert */ | 257 | #define SSL_kDHE 0x00000008L /* tmp DH key no DH cert */ |
258 | #define SSL_kECDHr 0x00000020L /* ECDH cert, RSA CA cert */ | ||
259 | #define SSL_kECDHe 0x00000040L /* ECDH cert, ECDSA CA cert */ | ||
260 | #define SSL_kECDHE 0x00000080L /* ephemeral ECDH */ | 258 | #define SSL_kECDHE 0x00000080L /* ephemeral ECDH */ |
261 | #define SSL_kGOST 0x00000200L /* GOST key exchange */ | 259 | #define SSL_kGOST 0x00000200L /* GOST key exchange */ |
262 | 260 | ||
@@ -264,11 +262,9 @@ | |||
264 | #define SSL_aRSA 0x00000001L /* RSA auth */ | 262 | #define SSL_aRSA 0x00000001L /* RSA auth */ |
265 | #define SSL_aDSS 0x00000002L /* DSS auth */ | 263 | #define SSL_aDSS 0x00000002L /* DSS auth */ |
266 | #define SSL_aNULL 0x00000004L /* no auth (i.e. use ADH or AECDH) */ | 264 | #define SSL_aNULL 0x00000004L /* no auth (i.e. use ADH or AECDH) */ |
267 | #define SSL_aECDH 0x00000010L /* Fixed ECDH auth (kECDHe or kECDHr) */ | ||
268 | #define SSL_aECDSA 0x00000040L /* ECDSA auth*/ | 265 | #define SSL_aECDSA 0x00000040L /* ECDSA auth*/ |
269 | #define SSL_aGOST01 0x00000200L /* GOST R 34.10-2001 signature auth */ | 266 | #define SSL_aGOST01 0x00000200L /* GOST R 34.10-2001 signature auth */ |
270 | 267 | ||
271 | |||
272 | /* Bits for algorithm_enc (symmetric encryption) */ | 268 | /* Bits for algorithm_enc (symmetric encryption) */ |
273 | #define SSL_DES 0x00000001L | 269 | #define SSL_DES 0x00000001L |
274 | #define SSL_3DES 0x00000002L | 270 | #define SSL_3DES 0x00000002L |