summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index ec8f0fb722..7c1aef68b1 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.67 2014/08/24 14:36:46 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.68 2014/09/07 12:16:23 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 *
@@ -254,8 +254,6 @@
254 254
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_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! */
259#define SSL_kDHE 0x00000008L /* tmp DH key no DH cert */ 257#define SSL_kDHE 0x00000008L /* tmp DH key no DH cert */
260#define SSL_kECDHr 0x00000020L /* ECDH cert, RSA CA cert */ 258#define SSL_kECDHr 0x00000020L /* ECDH cert, RSA CA cert */
261#define SSL_kECDHe 0x00000040L /* ECDH cert, ECDSA CA cert */ 259#define SSL_kECDHe 0x00000040L /* ECDH cert, ECDSA CA cert */
@@ -266,11 +264,10 @@
266#define SSL_aRSA 0x00000001L /* RSA auth */ 264#define SSL_aRSA 0x00000001L /* RSA auth */
267#define SSL_aDSS 0x00000002L /* DSS auth */ 265#define SSL_aDSS 0x00000002L /* DSS auth */
268#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) */
269#define SSL_aDH 0x00000008L /* Fixed DH auth (kDHd or kDHr) */ /* no such ciphersuites supported! */
270#define SSL_aECDH 0x00000010L /* Fixed ECDH auth (kECDHe or kECDHr) */ 267#define SSL_aECDH 0x00000010L /* Fixed ECDH auth (kECDHe or kECDHr) */
271#define SSL_aECDSA 0x00000040L /* ECDSA auth*/ 268#define SSL_aECDSA 0x00000040L /* ECDSA auth*/
272#define SSL_aGOST94 0x00000100L /* GOST R 34.10-94 signature auth */ 269#define SSL_aGOST94 0x00000100L /* GOST R 34.10-94 signature auth */
273#define SSL_aGOST01 0x00000200L /* GOST R 34.10-2001 signature auth */ 270#define SSL_aGOST01 0x00000200L /* GOST R 34.10-2001 signature auth */
274 271
275 272
276/* Bits for algorithm_enc (symmetric encryption) */ 273/* Bits for algorithm_enc (symmetric encryption) */