summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src/ssl/ssl_locl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/src/ssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/src/ssl/ssl_locl.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index 22ba8d926e..34e6337856 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.61 2014/07/12 19:45:53 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.62 2014/07/12 22:33:39 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 *
@@ -256,10 +256,10 @@
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! */ 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_kDHE 0x00000008L /* tmp DH key no DH cert */
260#define SSL_kECDHr 0x00000020L /* ECDH cert, RSA CA cert */ 260#define SSL_kECDHr 0x00000020L /* ECDH cert, RSA CA cert */
261#define SSL_kECDHe 0x00000040L /* ECDH cert, ECDSA CA cert */ 261#define SSL_kECDHe 0x00000040L /* ECDH cert, ECDSA CA cert */
262#define SSL_kEECDH 0x00000080L /* ephemeral ECDH */ 262#define SSL_kECDHE 0x00000080L /* ephemeral ECDH */
263#define SSL_kGOST 0x00000200L /* GOST key exchange */ 263#define SSL_kGOST 0x00000200L /* GOST key exchange */
264 264
265/* Bits for algorithm_auth (server authentication) */ 265/* Bits for algorithm_auth (server authentication) */
@@ -397,7 +397,7 @@
397/* SSL_kRSA <- RSA_ENC | (RSA_TMP & RSA_SIGN) | 397/* SSL_kRSA <- RSA_ENC | (RSA_TMP & RSA_SIGN) |
398 * <- (EXPORT & (RSA_ENC | RSA_TMP) & RSA_SIGN) 398 * <- (EXPORT & (RSA_ENC | RSA_TMP) & RSA_SIGN)
399 * SSL_kDH <- DH_ENC & (RSA_ENC | RSA_SIGN | DSA_SIGN) 399 * SSL_kDH <- DH_ENC & (RSA_ENC | RSA_SIGN | DSA_SIGN)
400 * SSL_kEDH <- RSA_ENC | RSA_SIGN | DSA_SIGN 400 * SSL_kDHE <- RSA_ENC | RSA_SIGN | DSA_SIGN
401 * SSL_aRSA <- RSA_ENC | RSA_SIGN 401 * SSL_aRSA <- RSA_ENC | RSA_SIGN
402 * SSL_aDSS <- DSA_SIGN 402 * SSL_aDSS <- DSA_SIGN
403 */ 403 */