diff options
Diffstat (limited to 'src/lib/libssl/src/ssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/src/ssl/ssl_locl.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h index dcc17963ee..b94249e9db 100644 --- a/src/lib/libssl/src/ssl/ssl_locl.h +++ b/src/lib/libssl/src/ssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.79 2014/12/06 14:24:26 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.80 2014/12/10 15:36:47 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 | * |
@@ -266,7 +266,6 @@ | |||
266 | #define SSL_aNULL 0x00000004L /* no auth (i.e. use ADH or AECDH) */ | 266 | #define SSL_aNULL 0x00000004L /* no auth (i.e. use ADH or AECDH) */ |
267 | #define SSL_aECDH 0x00000010L /* Fixed ECDH auth (kECDHe or kECDHr) */ | 267 | #define SSL_aECDH 0x00000010L /* Fixed ECDH auth (kECDHe or kECDHr) */ |
268 | #define SSL_aECDSA 0x00000040L /* ECDSA auth*/ | 268 | #define SSL_aECDSA 0x00000040L /* ECDSA auth*/ |
269 | #define SSL_aGOST94 0x00000100L /* GOST R 34.10-94 signature auth */ | ||
270 | #define SSL_aGOST01 0x00000200L /* GOST R 34.10-2001 signature auth */ | 269 | #define SSL_aGOST01 0x00000200L /* GOST R 34.10-2001 signature auth */ |
271 | 270 | ||
272 | 271 | ||
@@ -398,9 +397,8 @@ | |||
398 | #define SSL_PKEY_DH_RSA 3 | 397 | #define SSL_PKEY_DH_RSA 3 |
399 | #define SSL_PKEY_DH_DSA 4 | 398 | #define SSL_PKEY_DH_DSA 4 |
400 | #define SSL_PKEY_ECC 5 | 399 | #define SSL_PKEY_ECC 5 |
401 | #define SSL_PKEY_GOST94 6 | 400 | #define SSL_PKEY_GOST01 6 |
402 | #define SSL_PKEY_GOST01 7 | 401 | #define SSL_PKEY_NUM 7 |
403 | #define SSL_PKEY_NUM 8 | ||
404 | 402 | ||
405 | /* SSL_kRSA <- RSA_ENC | (RSA_TMP & RSA_SIGN) | | 403 | /* SSL_kRSA <- RSA_ENC | (RSA_TMP & RSA_SIGN) | |
406 | * <- (EXPORT & (RSA_ENC | RSA_TMP) & RSA_SIGN) | 404 | * <- (EXPORT & (RSA_ENC | RSA_TMP) & RSA_SIGN) |