diff options
| author | jsing <> | 2014-07-12 13:11:53 +0000 |
|---|---|---|
| committer | jsing <> | 2014-07-12 13:11:53 +0000 |
| commit | eda691287f99b3380367cbd224f295469c1c1dc1 (patch) | |
| tree | dd77c44528a0b25f7964c067da56be1302be9ee2 /src/lib/libssl/ssl_locl.h | |
| parent | f6d02d91130bc0ec3f15ccc3060f955bf75247e1 (diff) | |
| download | openbsd-eda691287f99b3380367cbd224f295469c1c1dc1.tar.gz openbsd-eda691287f99b3380367cbd224f295469c1c1dc1.tar.bz2 openbsd-eda691287f99b3380367cbd224f295469c1c1dc1.zip | |
Remove remnants from PSK, KRB5 and SRP.
ok beck@ miod@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_locl.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index c1e402b3a1..0d96ee5fe8 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.59 2014/07/11 08:17:36 miod Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.60 2014/07/12 13:11:53 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 | * |
| @@ -257,13 +257,10 @@ | |||
| 257 | #define SSL_kDHr 0x00000002L /* DH cert, RSA CA cert */ /* no such ciphersuites supported! */ | 257 | #define SSL_kDHr 0x00000002L /* DH cert, RSA CA cert */ /* no such ciphersuites supported! */ |
| 258 | #define SSL_kDHd 0x00000004L /* DH cert, DSA CA cert */ /* no such ciphersuite supported! */ | 258 | #define SSL_kDHd 0x00000004L /* DH cert, DSA CA cert */ /* no such ciphersuite supported! */ |
| 259 | #define SSL_kEDH 0x00000008L /* tmp DH key no DH cert */ | 259 | #define SSL_kEDH 0x00000008L /* tmp DH key no DH cert */ |
| 260 | #define SSL_kKRB5 0x00000010L /* Kerberos5 key exchange */ | ||
| 261 | #define SSL_kECDHr 0x00000020L /* ECDH cert, RSA CA cert */ | 260 | #define SSL_kECDHr 0x00000020L /* ECDH cert, RSA CA cert */ |
| 262 | #define SSL_kECDHe 0x00000040L /* ECDH cert, ECDSA CA cert */ | 261 | #define SSL_kECDHe 0x00000040L /* ECDH cert, ECDSA CA cert */ |
| 263 | #define SSL_kEECDH 0x00000080L /* ephemeral ECDH */ | 262 | #define SSL_kEECDH 0x00000080L /* ephemeral ECDH */ |
| 264 | #define SSL_kPSK 0x00000100L /* PSK */ | 263 | #define SSL_kGOST 0x00000200L /* GOST key exchange */ |
| 265 | #define SSL_kGOST 0x00000200L /* GOST key exchange */ | ||
| 266 | #define SSL_kSRP 0x00000400L /* SRP */ | ||
| 267 | 264 | ||
| 268 | /* Bits for algorithm_auth (server authentication) */ | 265 | /* Bits for algorithm_auth (server authentication) */ |
| 269 | #define SSL_aRSA 0x00000001L /* RSA auth */ | 266 | #define SSL_aRSA 0x00000001L /* RSA auth */ |
| @@ -271,9 +268,7 @@ | |||
| 271 | #define SSL_aNULL 0x00000004L /* no auth (i.e. use ADH or AECDH) */ | 268 | #define SSL_aNULL 0x00000004L /* no auth (i.e. use ADH or AECDH) */ |
| 272 | #define SSL_aDH 0x00000008L /* Fixed DH auth (kDHd or kDHr) */ /* no such ciphersuites supported! */ | 269 | #define SSL_aDH 0x00000008L /* Fixed DH auth (kDHd or kDHr) */ /* no such ciphersuites supported! */ |
| 273 | #define SSL_aECDH 0x00000010L /* Fixed ECDH auth (kECDHe or kECDHr) */ | 270 | #define SSL_aECDH 0x00000010L /* Fixed ECDH auth (kECDHe or kECDHr) */ |
| 274 | #define SSL_aKRB5 0x00000020L /* KRB5 auth */ | ||
| 275 | #define SSL_aECDSA 0x00000040L /* ECDSA auth*/ | 271 | #define SSL_aECDSA 0x00000040L /* ECDSA auth*/ |
| 276 | #define SSL_aPSK 0x00000080L /* PSK auth */ | ||
| 277 | #define SSL_aGOST94 0x00000100L /* GOST R 34.10-94 signature auth */ | 272 | #define SSL_aGOST94 0x00000100L /* GOST R 34.10-94 signature auth */ |
| 278 | #define SSL_aGOST01 0x00000200L /* GOST R 34.10-2001 signature auth */ | 273 | #define SSL_aGOST01 0x00000200L /* GOST R 34.10-2001 signature auth */ |
| 279 | 274 | ||