summaryrefslogtreecommitdiff
path: root/lib/libssl/ssl.h
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2014-10-15 13:57:22 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2014-10-15 13:57:22 +0000
commitb2fe5496abfbd7b1fd32f8d0d7e30f17b2510fef (patch)
tree68e5ebe35c0bf6ae3fa2f42079b1b9131531caaa /lib/libssl/ssl.h
parentd00ff4db4b8cfa0079e415bd5dd66367cbbe5a72 (diff)
Add cipher aliases for DHE (the correct name for EDH) and ECDHE (the
correct name for EECDH). The EDH and EECDH aliases remain for backwards compatibility.
Diffstat (limited to 'lib/libssl/ssl.h')
-rw-r--r--lib/libssl/ssl.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index 1e9e8461955..2b1ceaf2c70 100644
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.67 2014/10/03 13:58:18 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.68 2014/10/15 13:57:21 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -259,11 +259,13 @@ extern "C" {
#define SSL_TXT_DSS "DSS"
#define SSL_TXT_DH "DH"
-#define SSL_TXT_EDH "EDH" /* same as "kEDH:-ADH" */
+#define SSL_TXT_DHE "DHE" /* same as "kDHE:-ADH" */
+#define SSL_TXT_EDH "EDH" /* previous name for DHE */
#define SSL_TXT_ADH "ADH"
#define SSL_TXT_RSA "RSA"
#define SSL_TXT_ECDH "ECDH"
-#define SSL_TXT_EECDH "EECDH" /* same as "kEECDH:-AECDH" */
+#define SSL_TXT_ECDHE "ECDHE" /* same as "kECDHE:-AECDH" */
+#define SSL_TXT_EECDH "EECDH" /* previous name for ECDHE */
#define SSL_TXT_AECDH "AECDH"
#define SSL_TXT_ECDSA "ECDSA"
#define SSL_TXT_KRB5 "KRB5"