*/\r
\r
#ifndef HEADER_TLS1_H\r
-#define HEADER_TLS1_H\r
+# define HEADER_TLS1_H\r
\r
-#include <openssl/buffer.h>\r
+# include <openssl/buffer.h>\r
\r
#ifdef __cplusplus\r
extern "C" {\r
#endif\r
\r
-#define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0\r
-\r
-#define TLS1_VERSION 0x0301\r
-#define TLS1_1_VERSION 0x0302\r
-#define TLS1_2_VERSION 0x0303\r
-#define TLS_MAX_VERSION TLS1_2_VERSION\r
-\r
-#define TLS1_VERSION_MAJOR 0x03\r
-#define TLS1_VERSION_MINOR 0x01\r
-\r
-#define TLS1_1_VERSION_MAJOR 0x03\r
-#define TLS1_1_VERSION_MINOR 0x02\r
-\r
-#define TLS1_2_VERSION_MAJOR 0x03\r
-#define TLS1_2_VERSION_MINOR 0x03\r
-\r
-#define TLS1_get_version(s) \\r
- ((s->version >> 8) == TLS1_VERSION_MAJOR ? s->version : 0)\r
-\r
-#define TLS1_get_client_version(s) \\r
- ((s->client_version >> 8) == TLS1_VERSION_MAJOR ? s->client_version : 0)\r
-\r
-#define TLS1_AD_DECRYPTION_FAILED 21\r
-#define TLS1_AD_RECORD_OVERFLOW 22\r
-#define TLS1_AD_UNKNOWN_CA 48 /* fatal */\r
-#define TLS1_AD_ACCESS_DENIED 49 /* fatal */\r
-#define TLS1_AD_DECODE_ERROR 50 /* fatal */\r
-#define TLS1_AD_DECRYPT_ERROR 51\r
-#define TLS1_AD_EXPORT_RESTRICTION 60 /* fatal */\r
-#define TLS1_AD_PROTOCOL_VERSION 70 /* fatal */\r
-#define TLS1_AD_INSUFFICIENT_SECURITY 71 /* fatal */\r
-#define TLS1_AD_INTERNAL_ERROR 80 /* fatal */\r
-#define TLS1_AD_INAPPROPRIATE_FALLBACK 86 /* fatal */\r
-#define TLS1_AD_USER_CANCELLED 90\r
-#define TLS1_AD_NO_RENEGOTIATION 100\r
+# define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0\r
+\r
+# define TLS1_VERSION 0x0301\r
+# define TLS1_1_VERSION 0x0302\r
+# define TLS1_2_VERSION 0x0303\r
+# define TLS_MAX_VERSION TLS1_2_VERSION\r
+\r
+# define TLS1_VERSION_MAJOR 0x03\r
+# define TLS1_VERSION_MINOR 0x01\r
+\r
+# define TLS1_1_VERSION_MAJOR 0x03\r
+# define TLS1_1_VERSION_MINOR 0x02\r
+\r
+# define TLS1_2_VERSION_MAJOR 0x03\r
+# define TLS1_2_VERSION_MINOR 0x03\r
+\r
+# define TLS1_get_version(s) \\r
+ ((s->version >> 8) == TLS1_VERSION_MAJOR ? s->version : 0)\r
+\r
+# define TLS1_get_client_version(s) \\r
+ ((s->client_version >> 8) == TLS1_VERSION_MAJOR ? s->client_version : 0)\r
+\r
+# define TLS1_AD_DECRYPTION_FAILED 21\r
+# define TLS1_AD_RECORD_OVERFLOW 22\r
+# define TLS1_AD_UNKNOWN_CA 48/* fatal */\r
+# define TLS1_AD_ACCESS_DENIED 49/* fatal */\r
+# define TLS1_AD_DECODE_ERROR 50/* fatal */\r
+# define TLS1_AD_DECRYPT_ERROR 51\r
+# define TLS1_AD_EXPORT_RESTRICTION 60/* fatal */\r
+# define TLS1_AD_PROTOCOL_VERSION 70/* fatal */\r
+# define TLS1_AD_INSUFFICIENT_SECURITY 71/* fatal */\r
+# define TLS1_AD_INTERNAL_ERROR 80/* fatal */\r
+# define TLS1_AD_INAPPROPRIATE_FALLBACK 86/* fatal */\r
+# define TLS1_AD_USER_CANCELLED 90\r
+# define TLS1_AD_NO_RENEGOTIATION 100\r
/* codes 110-114 are from RFC3546 */\r
-#define TLS1_AD_UNSUPPORTED_EXTENSION 110\r
-#define TLS1_AD_CERTIFICATE_UNOBTAINABLE 111\r
-#define TLS1_AD_UNRECOGNIZED_NAME 112\r
-#define TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 113\r
-#define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114\r
-#define TLS1_AD_UNKNOWN_PSK_IDENTITY 115 /* fatal */\r
+# define TLS1_AD_UNSUPPORTED_EXTENSION 110\r
+# define TLS1_AD_CERTIFICATE_UNOBTAINABLE 111\r
+# define TLS1_AD_UNRECOGNIZED_NAME 112\r
+# define TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 113\r
+# define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114\r
+# define TLS1_AD_UNKNOWN_PSK_IDENTITY 115/* fatal */\r
\r
/* ExtensionType values from RFC3546 / RFC4366 / RFC6066 */\r
-#define TLSEXT_TYPE_server_name 0\r
-#define TLSEXT_TYPE_max_fragment_length 1\r
-#define TLSEXT_TYPE_client_certificate_url 2\r
-#define TLSEXT_TYPE_trusted_ca_keys 3\r
-#define TLSEXT_TYPE_truncated_hmac 4\r
-#define TLSEXT_TYPE_status_request 5\r
+# define TLSEXT_TYPE_server_name 0\r
+# define TLSEXT_TYPE_max_fragment_length 1\r
+# define TLSEXT_TYPE_client_certificate_url 2\r
+# define TLSEXT_TYPE_trusted_ca_keys 3\r
+# define TLSEXT_TYPE_truncated_hmac 4\r
+# define TLSEXT_TYPE_status_request 5\r
/* ExtensionType values from RFC4681 */\r
-#define TLSEXT_TYPE_user_mapping 6\r
-\r
+# define TLSEXT_TYPE_user_mapping 6\r
/* ExtensionType values from RFC5878 */\r
-#define TLSEXT_TYPE_client_authz 7\r
-#define TLSEXT_TYPE_server_authz 8\r
-\r
+# define TLSEXT_TYPE_client_authz 7\r
+# define TLSEXT_TYPE_server_authz 8\r
/* ExtensionType values from RFC6091 */\r
-#define TLSEXT_TYPE_cert_type 9\r
+# define TLSEXT_TYPE_cert_type 9\r
\r
/* ExtensionType values from RFC4492 */\r
-#define TLSEXT_TYPE_elliptic_curves 10\r
-#define TLSEXT_TYPE_ec_point_formats 11\r
+# define TLSEXT_TYPE_elliptic_curves 10\r
+# define TLSEXT_TYPE_ec_point_formats 11\r
\r
/* ExtensionType value from RFC5054 */\r
-#define TLSEXT_TYPE_srp 12\r
+# define TLSEXT_TYPE_srp 12\r
\r
/* ExtensionType values from RFC5246 */\r
-#define TLSEXT_TYPE_signature_algorithms 13\r
+# define TLSEXT_TYPE_signature_algorithms 13\r
\r
/* ExtensionType value from RFC5764 */\r
-#define TLSEXT_TYPE_use_srtp 14\r
+# define TLSEXT_TYPE_use_srtp 14\r
\r
/* ExtensionType value from RFC5620 */\r
-#define TLSEXT_TYPE_heartbeat 15\r
+# define TLSEXT_TYPE_heartbeat 15\r
+\r
+/* ExtensionType value from draft-ietf-tls-applayerprotoneg-00 */\r
+# define TLSEXT_TYPE_application_layer_protocol_negotiation 16\r
\r
-/* ExtensionType value for TLS padding extension.\r
+/*\r
+ * ExtensionType value for TLS padding extension.\r
* http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml\r
* http://tools.ietf.org/html/draft-agl-tls-padding-03\r
*/\r
-#define TLSEXT_TYPE_padding 21\r
+# define TLSEXT_TYPE_padding 21\r
\r
/* ExtensionType value from RFC4507 */\r
-#define TLSEXT_TYPE_session_ticket 35\r
+# define TLSEXT_TYPE_session_ticket 35\r
\r
/* ExtensionType value from draft-rescorla-tls-opaque-prf-input-00.txt */\r
-#if 0 /* will have to be provided externally for now ,\r
- * i.e. build with -DTLSEXT_TYPE_opaque_prf_input=38183\r
- * using whatever extension number you'd like to try */\r
-# define TLSEXT_TYPE_opaque_prf_input ?? */\r
-#endif\r
+# if 0\r
+/*\r
+ * will have to be provided externally for now ,\r
+ * i.e. build with -DTLSEXT_TYPE_opaque_prf_input=38183\r
+ * using whatever extension number you'd like to try\r
+ */\r
+# define TLSEXT_TYPE_opaque_prf_input ??\r
+# endif\r
\r
/* Temporary extension type */\r
-#define TLSEXT_TYPE_renegotiate 0xff01\r
+# define TLSEXT_TYPE_renegotiate 0xff01\r
\r
-#ifndef OPENSSL_NO_NEXTPROTONEG\r
+# ifndef OPENSSL_NO_NEXTPROTONEG\r
/* This is not an IANA defined extension number */\r
-#define TLSEXT_TYPE_next_proto_neg 13172\r
-#endif\r
+# define TLSEXT_TYPE_next_proto_neg 13172\r
+# endif\r
\r
/* NameType value from RFC 3546 */\r
-#define TLSEXT_NAMETYPE_host_name 0\r
+# define TLSEXT_NAMETYPE_host_name 0\r
/* status request value from RFC 3546 */\r
-#define TLSEXT_STATUSTYPE_ocsp 1\r
+# define TLSEXT_STATUSTYPE_ocsp 1\r
\r
/* ECPointFormat values from draft-ietf-tls-ecc-12 */\r
-#define TLSEXT_ECPOINTFORMAT_first 0\r
-#define TLSEXT_ECPOINTFORMAT_uncompressed 0\r
-#define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime 1\r
-#define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2 2\r
-#define TLSEXT_ECPOINTFORMAT_last 2\r
+# define TLSEXT_ECPOINTFORMAT_first 0\r
+# define TLSEXT_ECPOINTFORMAT_uncompressed 0\r
+# define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime 1\r
+# define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2 2\r
+# define TLSEXT_ECPOINTFORMAT_last 2\r
\r
/* Signature and hash algorithms from RFC 5246 */\r
\r
-#define TLSEXT_signature_anonymous 0\r
-#define TLSEXT_signature_rsa 1\r
-#define TLSEXT_signature_dsa 2\r
-#define TLSEXT_signature_ecdsa 3\r
+# define TLSEXT_signature_anonymous 0\r
+# define TLSEXT_signature_rsa 1\r
+# define TLSEXT_signature_dsa 2\r
+# define TLSEXT_signature_ecdsa 3\r
+\r
+/* Total number of different signature algorithms */\r
+# define TLSEXT_signature_num 4\r
+\r
+# define TLSEXT_hash_none 0\r
+# define TLSEXT_hash_md5 1\r
+# define TLSEXT_hash_sha1 2\r
+# define TLSEXT_hash_sha224 3\r
+# define TLSEXT_hash_sha256 4\r
+# define TLSEXT_hash_sha384 5\r
+# define TLSEXT_hash_sha512 6\r
+\r
+/* Total number of different digest algorithms */\r
+\r
+# define TLSEXT_hash_num 7\r
\r
-#define TLSEXT_hash_none 0\r
-#define TLSEXT_hash_md5 1\r
-#define TLSEXT_hash_sha1 2\r
-#define TLSEXT_hash_sha224 3\r
-#define TLSEXT_hash_sha256 4\r
-#define TLSEXT_hash_sha384 5\r
-#define TLSEXT_hash_sha512 6\r
+/* Flag set for unrecognised algorithms */\r
+# define TLSEXT_nid_unknown 0x1000000\r
\r
-#ifndef OPENSSL_NO_TLSEXT\r
+/* ECC curves */\r
\r
-#define TLSEXT_MAXLEN_host_name 255\r
+# define TLSEXT_curve_P_256 23\r
+# define TLSEXT_curve_P_384 24\r
+\r
+# ifndef OPENSSL_NO_TLSEXT\r
+\r
+# define TLSEXT_MAXLEN_host_name 255\r
\r
const char *SSL_get_servername(const SSL *s, const int type);\r
int SSL_get_servername_type(const SSL *s);\r
-/* SSL_export_keying_material exports a value derived from the master secret,\r
+/*\r
+ * SSL_export_keying_material exports a value derived from the master secret,\r
* as specified in RFC 5705. It writes |olen| bytes to |out| given a label and\r
* optional context. (Since a zero length context is allowed, the |use_context|\r
- * flag controls whether a context is included.)\r
- *\r
- * It returns 1 on success and zero otherwise.\r
+ * flag controls whether a context is included.) It returns 1 on success and\r
+ * zero otherwise.\r
*/\r
int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,\r
- const char *label, size_t llen, const unsigned char *p, size_t plen,\r
- int use_context);\r
+ const char *label, size_t llen,\r
+ const unsigned char *p, size_t plen,\r
+ int use_context);\r
+\r
+int SSL_get_sigalgs(SSL *s, int idx,\r
+ int *psign, int *phash, int *psignandhash,\r
+ unsigned char *rsig, unsigned char *rhash);\r
+\r
+int SSL_get_shared_sigalgs(SSL *s, int idx,\r
+ int *psign, int *phash, int *psignandhash,\r
+ unsigned char *rsig, unsigned char *rhash);\r
\r
-#define SSL_set_tlsext_host_name(s,name) \\r
+int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain);\r
+\r
+# define SSL_set_tlsext_host_name(s,name) \\r
SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name)\r
\r
-#define SSL_set_tlsext_debug_callback(ssl, cb) \\r
+# define SSL_set_tlsext_debug_callback(ssl, cb) \\r
SSL_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_CB,(void (*)(void))cb)\r
\r
-#define SSL_set_tlsext_debug_arg(ssl, arg) \\r
+# define SSL_set_tlsext_debug_arg(ssl, arg) \\r
SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0, (void *)arg)\r
\r
-#define SSL_set_tlsext_status_type(ssl, type) \\r
+# define SSL_set_tlsext_status_type(ssl, type) \\r
SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE,type, NULL)\r
\r
-#define SSL_get_tlsext_status_exts(ssl, arg) \\r
+# define SSL_get_tlsext_status_exts(ssl, arg) \\r
SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)\r
\r
-#define SSL_set_tlsext_status_exts(ssl, arg) \\r
+# define SSL_set_tlsext_status_exts(ssl, arg) \\r
SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)\r
\r
-#define SSL_get_tlsext_status_ids(ssl, arg) \\r
+# define SSL_get_tlsext_status_ids(ssl, arg) \\r
SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)\r
\r
-#define SSL_set_tlsext_status_ids(ssl, arg) \\r
+# define SSL_set_tlsext_status_ids(ssl, arg) \\r
SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)\r
\r
-#define SSL_get_tlsext_status_ocsp_resp(ssl, arg) \\r
+# define SSL_get_tlsext_status_ocsp_resp(ssl, arg) \\r
SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP,0, (void *)arg)\r
\r
-#define SSL_set_tlsext_status_ocsp_resp(ssl, arg, arglen) \\r
+# define SSL_set_tlsext_status_ocsp_resp(ssl, arg, arglen) \\r
SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP,arglen, (void *)arg)\r
\r
-#define SSL_CTX_set_tlsext_servername_callback(ctx, cb) \\r
+# define SSL_CTX_set_tlsext_servername_callback(ctx, cb) \\r
SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,(void (*)(void))cb)\r
\r
-#define SSL_TLSEXT_ERR_OK 0\r
-#define SSL_TLSEXT_ERR_ALERT_WARNING 1\r
-#define SSL_TLSEXT_ERR_ALERT_FATAL 2\r
-#define SSL_TLSEXT_ERR_NOACK 3\r
+# define SSL_TLSEXT_ERR_OK 0\r
+# define SSL_TLSEXT_ERR_ALERT_WARNING 1\r
+# define SSL_TLSEXT_ERR_ALERT_FATAL 2\r
+# define SSL_TLSEXT_ERR_NOACK 3\r
\r
-#define SSL_CTX_set_tlsext_servername_arg(ctx, arg) \\r
+# define SSL_CTX_set_tlsext_servername_arg(ctx, arg) \\r
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0, (void *)arg)\r
\r
-#define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \\r
- SSL_CTX_ctrl((ctx),SSL_CTRL_GET_TLSEXT_TICKET_KEYS,(keylen),(keys))\r
-#define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \\r
- SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLSEXT_TICKET_KEYS,(keylen),(keys))\r
+# define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \\r
+ SSL_CTX_ctrl((ctx),SSL_CTRL_GET_TLSEXT_TICKET_KEYS,(keylen),(keys))\r
+# define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \\r
+ SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLSEXT_TICKET_KEYS,(keylen),(keys))\r
\r
-#define SSL_CTX_set_tlsext_status_cb(ssl, cb) \\r
+# define SSL_CTX_set_tlsext_status_cb(ssl, cb) \\r
SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,(void (*)(void))cb)\r
\r
-#define SSL_CTX_set_tlsext_status_arg(ssl, arg) \\r
+# define SSL_CTX_set_tlsext_status_arg(ssl, arg) \\r
SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)arg)\r
\r
-#define SSL_set_tlsext_opaque_prf_input(s, src, len) \\r
+# define SSL_set_tlsext_opaque_prf_input(s, src, len) \\r
SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT, len, src)\r
-#define SSL_CTX_set_tlsext_opaque_prf_input_callback(ctx, cb) \\r
+# define SSL_CTX_set_tlsext_opaque_prf_input_callback(ctx, cb) \\r
SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB, (void (*)(void))cb)\r
-#define SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(ctx, arg) \\r
+# define SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(ctx, arg) \\r
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG, 0, arg)\r
\r
-#define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \\r
+# define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \\r
SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)\r
\r
-#ifndef OPENSSL_NO_HEARTBEATS\r
-#define SSL_TLSEXT_HB_ENABLED 0x01\r
-#define SSL_TLSEXT_HB_DONT_SEND_REQUESTS 0x02\r
-#define SSL_TLSEXT_HB_DONT_RECV_REQUESTS 0x04\r
+# ifndef OPENSSL_NO_HEARTBEATS\r
+# define SSL_TLSEXT_HB_ENABLED 0x01\r
+# define SSL_TLSEXT_HB_DONT_SEND_REQUESTS 0x02\r
+# define SSL_TLSEXT_HB_DONT_RECV_REQUESTS 0x04\r
\r
-#define SSL_get_tlsext_heartbeat_pending(ssl) \\r
+# define SSL_get_tlsext_heartbeat_pending(ssl) \\r
SSL_ctrl((ssl),SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING,0,NULL)\r
-#define SSL_set_tlsext_heartbeat_no_requests(ssl, arg) \\r
+# define SSL_set_tlsext_heartbeat_no_requests(ssl, arg) \\r
SSL_ctrl((ssl),SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS,arg,NULL)\r
-#endif\r
-#endif\r
+# endif\r
+# endif\r
\r
/* PSK ciphersuites from 4279 */\r
-#define TLS1_CK_PSK_WITH_RC4_128_SHA 0x0300008A\r
-#define TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA 0x0300008B\r
-#define TLS1_CK_PSK_WITH_AES_128_CBC_SHA 0x0300008C\r
-#define TLS1_CK_PSK_WITH_AES_256_CBC_SHA 0x0300008D\r
-\r
-/* Additional TLS ciphersuites from expired Internet Draft\r
- * draft-ietf-tls-56-bit-ciphersuites-01.txt\r
- * (available if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES is defined, see\r
- * s3_lib.c). We actually treat them like SSL 3.0 ciphers, which we probably\r
- * shouldn't. Note that the first two are actually not in the IDs. */\r
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5 0x03000060 /* not in ID */\r
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 0x03000061 /* not in ID */\r
-#define TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA 0x03000062\r
-#define TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA 0x03000063\r
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA 0x03000064\r
-#define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA 0x03000065\r
-#define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA 0x03000066\r
+# define TLS1_CK_PSK_WITH_RC4_128_SHA 0x0300008A\r
+# define TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA 0x0300008B\r
+# define TLS1_CK_PSK_WITH_AES_128_CBC_SHA 0x0300008C\r
+# define TLS1_CK_PSK_WITH_AES_256_CBC_SHA 0x0300008D\r
+\r
+/*\r
+ * Additional TLS ciphersuites from expired Internet Draft\r
+ * draft-ietf-tls-56-bit-ciphersuites-01.txt (available if\r
+ * TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES is defined, see s3_lib.c). We\r
+ * actually treat them like SSL 3.0 ciphers, which we probably shouldn't.\r
+ * Note that the first two are actually not in the IDs.\r
+ */\r
+# define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5 0x03000060/* not in\r
+ * ID */\r
+# define TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 0x03000061/* not in\r
+ * ID */\r
+# define TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA 0x03000062\r
+# define TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA 0x03000063\r
+# define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA 0x03000064\r
+# define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA 0x03000065\r
+# define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA 0x03000066\r
\r
/* AES ciphersuites from RFC3268 */\r
\r
-#define TLS1_CK_RSA_WITH_AES_128_SHA 0x0300002F\r
-#define TLS1_CK_DH_DSS_WITH_AES_128_SHA 0x03000030\r
-#define TLS1_CK_DH_RSA_WITH_AES_128_SHA 0x03000031\r
-#define TLS1_CK_DHE_DSS_WITH_AES_128_SHA 0x03000032\r
-#define TLS1_CK_DHE_RSA_WITH_AES_128_SHA 0x03000033\r
-#define TLS1_CK_ADH_WITH_AES_128_SHA 0x03000034\r
+# define TLS1_CK_RSA_WITH_AES_128_SHA 0x0300002F\r
+# define TLS1_CK_DH_DSS_WITH_AES_128_SHA 0x03000030\r
+# define TLS1_CK_DH_RSA_WITH_AES_128_SHA 0x03000031\r
+# define TLS1_CK_DHE_DSS_WITH_AES_128_SHA 0x03000032\r
+# define TLS1_CK_DHE_RSA_WITH_AES_128_SHA 0x03000033\r
+# define TLS1_CK_ADH_WITH_AES_128_SHA 0x03000034\r
\r
-#define TLS1_CK_RSA_WITH_AES_256_SHA 0x03000035\r
-#define TLS1_CK_DH_DSS_WITH_AES_256_SHA 0x03000036\r
-#define TLS1_CK_DH_RSA_WITH_AES_256_SHA 0x03000037\r
-#define TLS1_CK_DHE_DSS_WITH_AES_256_SHA 0x03000038\r
-#define TLS1_CK_DHE_RSA_WITH_AES_256_SHA 0x03000039\r
-#define TLS1_CK_ADH_WITH_AES_256_SHA 0x0300003A\r
+# define TLS1_CK_RSA_WITH_AES_256_SHA 0x03000035\r
+# define TLS1_CK_DH_DSS_WITH_AES_256_SHA 0x03000036\r
+# define TLS1_CK_DH_RSA_WITH_AES_256_SHA 0x03000037\r
+# define TLS1_CK_DHE_DSS_WITH_AES_256_SHA 0x03000038\r
+# define TLS1_CK_DHE_RSA_WITH_AES_256_SHA 0x03000039\r
+# define TLS1_CK_ADH_WITH_AES_256_SHA 0x0300003A\r
\r
/* TLS v1.2 ciphersuites */\r
-#define TLS1_CK_RSA_WITH_NULL_SHA256 0x0300003B\r
-#define TLS1_CK_RSA_WITH_AES_128_SHA256 0x0300003C\r
-#define TLS1_CK_RSA_WITH_AES_256_SHA256 0x0300003D\r
-#define TLS1_CK_DH_DSS_WITH_AES_128_SHA256 0x0300003E\r
-#define TLS1_CK_DH_RSA_WITH_AES_128_SHA256 0x0300003F\r
-#define TLS1_CK_DHE_DSS_WITH_AES_128_SHA256 0x03000040\r
+# define TLS1_CK_RSA_WITH_NULL_SHA256 0x0300003B\r
+# define TLS1_CK_RSA_WITH_AES_128_SHA256 0x0300003C\r
+# define TLS1_CK_RSA_WITH_AES_256_SHA256 0x0300003D\r
+# define TLS1_CK_DH_DSS_WITH_AES_128_SHA256 0x0300003E\r
+# define TLS1_CK_DH_RSA_WITH_AES_128_SHA256 0x0300003F\r
+# define TLS1_CK_DHE_DSS_WITH_AES_128_SHA256 0x03000040\r
\r
/* Camellia ciphersuites from RFC4132 */\r
-#define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000041\r
-#define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA 0x03000042\r
-#define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000043\r
-#define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA 0x03000044\r
-#define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000045\r
-#define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA 0x03000046\r
+# define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000041\r
+# define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA 0x03000042\r
+# define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000043\r
+# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA 0x03000044\r
+# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000045\r
+# define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA 0x03000046\r
\r
/* TLS v1.2 ciphersuites */\r
-#define TLS1_CK_DHE_RSA_WITH_AES_128_SHA256 0x03000067\r
-#define TLS1_CK_DH_DSS_WITH_AES_256_SHA256 0x03000068\r
-#define TLS1_CK_DH_RSA_WITH_AES_256_SHA256 0x03000069\r
-#define TLS1_CK_DHE_DSS_WITH_AES_256_SHA256 0x0300006A\r
-#define TLS1_CK_DHE_RSA_WITH_AES_256_SHA256 0x0300006B\r
-#define TLS1_CK_ADH_WITH_AES_128_SHA256 0x0300006C\r
-#define TLS1_CK_ADH_WITH_AES_256_SHA256 0x0300006D\r
+# define TLS1_CK_DHE_RSA_WITH_AES_128_SHA256 0x03000067\r
+# define TLS1_CK_DH_DSS_WITH_AES_256_SHA256 0x03000068\r
+# define TLS1_CK_DH_RSA_WITH_AES_256_SHA256 0x03000069\r
+# define TLS1_CK_DHE_DSS_WITH_AES_256_SHA256 0x0300006A\r
+# define TLS1_CK_DHE_RSA_WITH_AES_256_SHA256 0x0300006B\r
+# define TLS1_CK_ADH_WITH_AES_128_SHA256 0x0300006C\r
+# define TLS1_CK_ADH_WITH_AES_256_SHA256 0x0300006D\r
\r
/* Camellia ciphersuites from RFC4132 */\r
-#define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000084\r
-#define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA 0x03000085\r
-#define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000086\r
-#define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA 0x03000087\r
-#define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000088\r
-#define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA 0x03000089\r
+# define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000084\r
+# define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA 0x03000085\r
+# define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000086\r
+# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA 0x03000087\r
+# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000088\r
+# define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA 0x03000089\r
\r
/* SEED ciphersuites from RFC4162 */\r
-#define TLS1_CK_RSA_WITH_SEED_SHA 0x03000096\r
-#define TLS1_CK_DH_DSS_WITH_SEED_SHA 0x03000097\r
-#define TLS1_CK_DH_RSA_WITH_SEED_SHA 0x03000098\r
-#define TLS1_CK_DHE_DSS_WITH_SEED_SHA 0x03000099\r
-#define TLS1_CK_DHE_RSA_WITH_SEED_SHA 0x0300009A\r
-#define TLS1_CK_ADH_WITH_SEED_SHA 0x0300009B\r
+# define TLS1_CK_RSA_WITH_SEED_SHA 0x03000096\r
+# define TLS1_CK_DH_DSS_WITH_SEED_SHA 0x03000097\r
+# define TLS1_CK_DH_RSA_WITH_SEED_SHA 0x03000098\r
+# define TLS1_CK_DHE_DSS_WITH_SEED_SHA 0x03000099\r
+# define TLS1_CK_DHE_RSA_WITH_SEED_SHA 0x0300009A\r
+# define TLS1_CK_ADH_WITH_SEED_SHA 0x0300009B\r
\r
/* TLS v1.2 GCM ciphersuites from RFC5288 */\r
-#define TLS1_CK_RSA_WITH_AES_128_GCM_SHA256 0x0300009C\r
-#define TLS1_CK_RSA_WITH_AES_256_GCM_SHA384 0x0300009D\r
-#define TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256 0x0300009E\r
-#define TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384 0x0300009F\r
-#define TLS1_CK_DH_RSA_WITH_AES_128_GCM_SHA256 0x030000A0\r
-#define TLS1_CK_DH_RSA_WITH_AES_256_GCM_SHA384 0x030000A1\r
-#define TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256 0x030000A2\r
-#define TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384 0x030000A3\r
-#define TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256 0x030000A4\r
-#define TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384 0x030000A5\r
-#define TLS1_CK_ADH_WITH_AES_128_GCM_SHA256 0x030000A6\r
-#define TLS1_CK_ADH_WITH_AES_256_GCM_SHA384 0x030000A7\r
-\r
-/* ECC ciphersuites from draft-ietf-tls-ecc-12.txt with changes soon to be in draft 13 */\r
-#define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA 0x0300C001\r
-#define TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA 0x0300C002\r
-#define TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA 0x0300C003\r
-#define TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA 0x0300C004\r
-#define TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA 0x0300C005\r
-\r
-#define TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA 0x0300C006\r
-#define TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA 0x0300C007\r
-#define TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA 0x0300C008\r
-#define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA 0x0300C009\r
-#define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA 0x0300C00A\r
-\r
-#define TLS1_CK_ECDH_RSA_WITH_NULL_SHA 0x0300C00B\r
-#define TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA 0x0300C00C\r
-#define TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA 0x0300C00D\r
-#define TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA 0x0300C00E\r
-#define TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA 0x0300C00F\r
-\r
-#define TLS1_CK_ECDHE_RSA_WITH_NULL_SHA 0x0300C010\r
-#define TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA 0x0300C011\r
-#define TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA 0x0300C012\r
-#define TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA 0x0300C013\r
-#define TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA 0x0300C014\r
-\r
-#define TLS1_CK_ECDH_anon_WITH_NULL_SHA 0x0300C015\r
-#define TLS1_CK_ECDH_anon_WITH_RC4_128_SHA 0x0300C016\r
-#define TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA 0x0300C017\r
-#define TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA 0x0300C018\r
-#define TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA 0x0300C019\r
+# define TLS1_CK_RSA_WITH_AES_128_GCM_SHA256 0x0300009C\r
+# define TLS1_CK_RSA_WITH_AES_256_GCM_SHA384 0x0300009D\r
+# define TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256 0x0300009E\r
+# define TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384 0x0300009F\r
+# define TLS1_CK_DH_RSA_WITH_AES_128_GCM_SHA256 0x030000A0\r
+# define TLS1_CK_DH_RSA_WITH_AES_256_GCM_SHA384 0x030000A1\r
+# define TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256 0x030000A2\r
+# define TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384 0x030000A3\r
+# define TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256 0x030000A4\r
+# define TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384 0x030000A5\r
+# define TLS1_CK_ADH_WITH_AES_128_GCM_SHA256 0x030000A6\r
+# define TLS1_CK_ADH_WITH_AES_256_GCM_SHA384 0x030000A7\r
+\r
+/*\r
+ * ECC ciphersuites from draft-ietf-tls-ecc-12.txt with changes soon to be in\r
+ * draft 13\r
+ */\r
+# define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA 0x0300C001\r
+# define TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA 0x0300C002\r
+# define TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA 0x0300C003\r
+# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA 0x0300C004\r
+# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA 0x0300C005\r
+\r
+# define TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA 0x0300C006\r
+# define TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA 0x0300C007\r
+# define TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA 0x0300C008\r
+# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA 0x0300C009\r
+# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA 0x0300C00A\r
+\r
+# define TLS1_CK_ECDH_RSA_WITH_NULL_SHA 0x0300C00B\r
+# define TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA 0x0300C00C\r
+# define TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA 0x0300C00D\r
+# define TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA 0x0300C00E\r
+# define TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA 0x0300C00F\r
+\r
+# define TLS1_CK_ECDHE_RSA_WITH_NULL_SHA 0x0300C010\r
+# define TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA 0x0300C011\r
+# define TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA 0x0300C012\r
+# define TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA 0x0300C013\r
+# define TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA 0x0300C014\r
+\r
+# define TLS1_CK_ECDH_anon_WITH_NULL_SHA 0x0300C015\r
+# define TLS1_CK_ECDH_anon_WITH_RC4_128_SHA 0x0300C016\r
+# define TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA 0x0300C017\r
+# define TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA 0x0300C018\r
+# define TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA 0x0300C019\r
\r
/* SRP ciphersuites from RFC 5054 */\r
-#define TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA 0x0300C01A\r
-#define TLS1_CK_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA 0x0300C01B\r
-#define TLS1_CK_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA 0x0300C01C\r
-#define TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA 0x0300C01D\r
-#define TLS1_CK_SRP_SHA_RSA_WITH_AES_128_CBC_SHA 0x0300C01E\r
-#define TLS1_CK_SRP_SHA_DSS_WITH_AES_128_CBC_SHA 0x0300C01F\r
-#define TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA 0x0300C020\r
-#define TLS1_CK_SRP_SHA_RSA_WITH_AES_256_CBC_SHA 0x0300C021\r
-#define TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA 0x0300C022\r
+# define TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA 0x0300C01A\r
+# define TLS1_CK_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA 0x0300C01B\r
+# define TLS1_CK_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA 0x0300C01C\r
+# define TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA 0x0300C01D\r
+# define TLS1_CK_SRP_SHA_RSA_WITH_AES_128_CBC_SHA 0x0300C01E\r
+# define TLS1_CK_SRP_SHA_DSS_WITH_AES_128_CBC_SHA 0x0300C01F\r
+# define TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA 0x0300C020\r
+# define TLS1_CK_SRP_SHA_RSA_WITH_AES_256_CBC_SHA 0x0300C021\r
+# define TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA 0x0300C022\r
\r
/* ECDH HMAC based ciphersuites from RFC5289 */\r
\r
-#define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256 0x0300C023\r
-#define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384 0x0300C024\r
-#define TLS1_CK_ECDH_ECDSA_WITH_AES_128_SHA256 0x0300C025\r
-#define TLS1_CK_ECDH_ECDSA_WITH_AES_256_SHA384 0x0300C026\r
-#define TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256 0x0300C027\r
-#define TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384 0x0300C028\r
-#define TLS1_CK_ECDH_RSA_WITH_AES_128_SHA256 0x0300C029\r
-#define TLS1_CK_ECDH_RSA_WITH_AES_256_SHA384 0x0300C02A\r
+# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256 0x0300C023\r
+# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384 0x0300C024\r
+# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_SHA256 0x0300C025\r
+# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_SHA384 0x0300C026\r
+# define TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256 0x0300C027\r
+# define TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384 0x0300C028\r
+# define TLS1_CK_ECDH_RSA_WITH_AES_128_SHA256 0x0300C029\r
+# define TLS1_CK_ECDH_RSA_WITH_AES_256_SHA384 0x0300C02A\r
\r
/* ECDH GCM based ciphersuites from RFC5289 */\r
-#define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 0x0300C02B\r
-#define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 0x0300C02C\r
-#define TLS1_CK_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 0x0300C02D\r
-#define TLS1_CK_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 0x0300C02E\r
-#define TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256 0x0300C02F\r
-#define TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384 0x0300C030\r
-#define TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256 0x0300C031\r
-#define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384 0x0300C032\r
-\r
-/* XXX\r
- * Inconsistency alert:\r
- * The OpenSSL names of ciphers with ephemeral DH here include the string\r
- * "DHE", while elsewhere it has always been "EDH".\r
- * (The alias for the list of all such ciphers also is "EDH".)\r
- * The specifications speak of "EDH"; maybe we should allow both forms\r
- * for everything. */\r
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5 "EXP1024-RC4-MD5"\r
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 "EXP1024-RC2-CBC-MD5"\r
-#define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DES-CBC-SHA"\r
-#define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DHE-DSS-DES-CBC-SHA"\r
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA "EXP1024-RC4-SHA"\r
-#define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA "EXP1024-DHE-DSS-RC4-SHA"\r
-#define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA "DHE-DSS-RC4-SHA"\r
+# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 0x0300C02B\r
+# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 0x0300C02C\r
+# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 0x0300C02D\r
+# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 0x0300C02E\r
+# define TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256 0x0300C02F\r
+# define TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384 0x0300C030\r
+# define TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256 0x0300C031\r
+# define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384 0x0300C032\r
+\r
+/*\r
+ * XXX * Backward compatibility alert: + * Older versions of OpenSSL gave\r
+ * some DHE ciphers names with "EDH" + * instead of "DHE". Going forward, we\r
+ * should be using DHE + * everywhere, though we may indefinitely maintain\r
+ * aliases for users + * or configurations that used "EDH" +\r
+ */\r
+# define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5 "EXP1024-RC4-MD5"\r
+# define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 "EXP1024-RC2-CBC-MD5"\r
+# define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DES-CBC-SHA"\r
+# define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DHE-DSS-DES-CBC-SHA"\r
+# define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA "EXP1024-RC4-SHA"\r
+# define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA "EXP1024-DHE-DSS-RC4-SHA"\r
+# define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA "DHE-DSS-RC4-SHA"\r
\r
/* AES ciphersuites from RFC3268 */\r
-#define TLS1_TXT_RSA_WITH_AES_128_SHA "AES128-SHA"\r
-#define TLS1_TXT_DH_DSS_WITH_AES_128_SHA "DH-DSS-AES128-SHA"\r
-#define TLS1_TXT_DH_RSA_WITH_AES_128_SHA "DH-RSA-AES128-SHA"\r
-#define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA "DHE-DSS-AES128-SHA"\r
-#define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA "DHE-RSA-AES128-SHA"\r
-#define TLS1_TXT_ADH_WITH_AES_128_SHA "ADH-AES128-SHA"\r
-\r
-#define TLS1_TXT_RSA_WITH_AES_256_SHA "AES256-SHA"\r
-#define TLS1_TXT_DH_DSS_WITH_AES_256_SHA "DH-DSS-AES256-SHA"\r
-#define TLS1_TXT_DH_RSA_WITH_AES_256_SHA "DH-RSA-AES256-SHA"\r
-#define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA "DHE-DSS-AES256-SHA"\r
-#define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA "DHE-RSA-AES256-SHA"\r
-#define TLS1_TXT_ADH_WITH_AES_256_SHA "ADH-AES256-SHA"\r
+# define TLS1_TXT_RSA_WITH_AES_128_SHA "AES128-SHA"\r
+# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA "DH-DSS-AES128-SHA"\r
+# define TLS1_TXT_DH_RSA_WITH_AES_128_SHA "DH-RSA-AES128-SHA"\r
+# define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA "DHE-DSS-AES128-SHA"\r
+# define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA "DHE-RSA-AES128-SHA"\r
+# define TLS1_TXT_ADH_WITH_AES_128_SHA "ADH-AES128-SHA"\r
+\r
+# define TLS1_TXT_RSA_WITH_AES_256_SHA "AES256-SHA"\r
+# define TLS1_TXT_DH_DSS_WITH_AES_256_SHA "DH-DSS-AES256-SHA"\r
+# define TLS1_TXT_DH_RSA_WITH_AES_256_SHA "DH-RSA-AES256-SHA"\r
+# define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA "DHE-DSS-AES256-SHA"\r
+# define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA "DHE-RSA-AES256-SHA"\r
+# define TLS1_TXT_ADH_WITH_AES_256_SHA "ADH-AES256-SHA"\r
\r
/* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (Mar 15, 2001) */\r
-#define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA "ECDH-ECDSA-NULL-SHA"\r
-#define TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA "ECDH-ECDSA-RC4-SHA"\r
-#define TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA "ECDH-ECDSA-DES-CBC3-SHA"\r
-#define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA "ECDH-ECDSA-AES128-SHA"\r
-#define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA "ECDH-ECDSA-AES256-SHA"\r
-\r
-#define TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA "ECDHE-ECDSA-NULL-SHA"\r
-#define TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA "ECDHE-ECDSA-RC4-SHA"\r
-#define TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA "ECDHE-ECDSA-DES-CBC3-SHA"\r
-#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA "ECDHE-ECDSA-AES128-SHA"\r
-#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA "ECDHE-ECDSA-AES256-SHA"\r
-\r
-#define TLS1_TXT_ECDH_RSA_WITH_NULL_SHA "ECDH-RSA-NULL-SHA"\r
-#define TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA "ECDH-RSA-RC4-SHA"\r
-#define TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA "ECDH-RSA-DES-CBC3-SHA"\r
-#define TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA "ECDH-RSA-AES128-SHA"\r
-#define TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA "ECDH-RSA-AES256-SHA"\r
-\r
-#define TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA "ECDHE-RSA-NULL-SHA"\r
-#define TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA "ECDHE-RSA-RC4-SHA"\r
-#define TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA "ECDHE-RSA-DES-CBC3-SHA"\r
-#define TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA "ECDHE-RSA-AES128-SHA"\r
-#define TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA "ECDHE-RSA-AES256-SHA"\r
-\r
-#define TLS1_TXT_ECDH_anon_WITH_NULL_SHA "AECDH-NULL-SHA"\r
-#define TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA "AECDH-RC4-SHA"\r
-#define TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA "AECDH-DES-CBC3-SHA"\r
-#define TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA "AECDH-AES128-SHA"\r
-#define TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA "AECDH-AES256-SHA"\r
+# define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA "ECDH-ECDSA-NULL-SHA"\r
+# define TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA "ECDH-ECDSA-RC4-SHA"\r
+# define TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA "ECDH-ECDSA-DES-CBC3-SHA"\r
+# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA "ECDH-ECDSA-AES128-SHA"\r
+# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA "ECDH-ECDSA-AES256-SHA"\r
+\r
+# define TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA "ECDHE-ECDSA-NULL-SHA"\r
+# define TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA "ECDHE-ECDSA-RC4-SHA"\r
+# define TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA "ECDHE-ECDSA-DES-CBC3-SHA"\r
+# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA "ECDHE-ECDSA-AES128-SHA"\r
+# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA "ECDHE-ECDSA-AES256-SHA"\r
+\r
+# define TLS1_TXT_ECDH_RSA_WITH_NULL_SHA "ECDH-RSA-NULL-SHA"\r
+# define TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA "ECDH-RSA-RC4-SHA"\r
+# define TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA "ECDH-RSA-DES-CBC3-SHA"\r
+# define TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA "ECDH-RSA-AES128-SHA"\r
+# define TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA "ECDH-RSA-AES256-SHA"\r
+\r
+# define TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA "ECDHE-RSA-NULL-SHA"\r
+# define TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA "ECDHE-RSA-RC4-SHA"\r
+# define TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA "ECDHE-RSA-DES-CBC3-SHA"\r
+# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA "ECDHE-RSA-AES128-SHA"\r
+# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA "ECDHE-RSA-AES256-SHA"\r
+\r
+# define TLS1_TXT_ECDH_anon_WITH_NULL_SHA "AECDH-NULL-SHA"\r
+# define TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA "AECDH-RC4-SHA"\r
+# define TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA "AECDH-DES-CBC3-SHA"\r
+# define TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA "AECDH-AES128-SHA"\r
+# define TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA "AECDH-AES256-SHA"\r
\r
/* PSK ciphersuites from RFC 4279 */\r
-#define TLS1_TXT_PSK_WITH_RC4_128_SHA "PSK-RC4-SHA"\r
-#define TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA "PSK-3DES-EDE-CBC-SHA"\r
-#define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA "PSK-AES128-CBC-SHA"\r
-#define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA "PSK-AES256-CBC-SHA"\r
+# define TLS1_TXT_PSK_WITH_RC4_128_SHA "PSK-RC4-SHA"\r
+# define TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA "PSK-3DES-EDE-CBC-SHA"\r
+# define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA "PSK-AES128-CBC-SHA"\r
+# define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA "PSK-AES256-CBC-SHA"\r
\r
/* SRP ciphersuite from RFC 5054 */\r
-#define TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA "SRP-3DES-EDE-CBC-SHA"\r
-#define TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA "SRP-RSA-3DES-EDE-CBC-SHA"\r
-#define TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA "SRP-DSS-3DES-EDE-CBC-SHA"\r
-#define TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA "SRP-AES-128-CBC-SHA"\r
-#define TLS1_TXT_SRP_SHA_RSA_WITH_AES_128_CBC_SHA "SRP-RSA-AES-128-CBC-SHA"\r
-#define TLS1_TXT_SRP_SHA_DSS_WITH_AES_128_CBC_SHA "SRP-DSS-AES-128-CBC-SHA"\r
-#define TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA "SRP-AES-256-CBC-SHA"\r
-#define TLS1_TXT_SRP_SHA_RSA_WITH_AES_256_CBC_SHA "SRP-RSA-AES-256-CBC-SHA"\r
-#define TLS1_TXT_SRP_SHA_DSS_WITH_AES_256_CBC_SHA "SRP-DSS-AES-256-CBC-SHA"\r
+# define TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA "SRP-3DES-EDE-CBC-SHA"\r
+# define TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA "SRP-RSA-3DES-EDE-CBC-SHA"\r
+# define TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA "SRP-DSS-3DES-EDE-CBC-SHA"\r
+# define TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA "SRP-AES-128-CBC-SHA"\r
+# define TLS1_TXT_SRP_SHA_RSA_WITH_AES_128_CBC_SHA "SRP-RSA-AES-128-CBC-SHA"\r
+# define TLS1_TXT_SRP_SHA_DSS_WITH_AES_128_CBC_SHA "SRP-DSS-AES-128-CBC-SHA"\r
+# define TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA "SRP-AES-256-CBC-SHA"\r
+# define TLS1_TXT_SRP_SHA_RSA_WITH_AES_256_CBC_SHA "SRP-RSA-AES-256-CBC-SHA"\r
+# define TLS1_TXT_SRP_SHA_DSS_WITH_AES_256_CBC_SHA "SRP-DSS-AES-256-CBC-SHA"\r
\r
/* Camellia ciphersuites from RFC4132 */\r
-#define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA "CAMELLIA128-SHA"\r
-#define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA "DH-DSS-CAMELLIA128-SHA"\r
-#define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA "DH-RSA-CAMELLIA128-SHA"\r
-#define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA "DHE-DSS-CAMELLIA128-SHA"\r
-#define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA "DHE-RSA-CAMELLIA128-SHA"\r
-#define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA "ADH-CAMELLIA128-SHA"\r
-\r
-#define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA "CAMELLIA256-SHA"\r
-#define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA "DH-DSS-CAMELLIA256-SHA"\r
-#define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA "DH-RSA-CAMELLIA256-SHA"\r
-#define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA "DHE-DSS-CAMELLIA256-SHA"\r
-#define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA "DHE-RSA-CAMELLIA256-SHA"\r
-#define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA "ADH-CAMELLIA256-SHA"\r
+# define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA "CAMELLIA128-SHA"\r
+# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA "DH-DSS-CAMELLIA128-SHA"\r
+# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA "DH-RSA-CAMELLIA128-SHA"\r
+# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA "DHE-DSS-CAMELLIA128-SHA"\r
+# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA "DHE-RSA-CAMELLIA128-SHA"\r
+# define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA "ADH-CAMELLIA128-SHA"\r
+\r
+# define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA "CAMELLIA256-SHA"\r
+# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA "DH-DSS-CAMELLIA256-SHA"\r
+# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA "DH-RSA-CAMELLIA256-SHA"\r
+# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA "DHE-DSS-CAMELLIA256-SHA"\r
+# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA "DHE-RSA-CAMELLIA256-SHA"\r
+# define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA "ADH-CAMELLIA256-SHA"\r
\r
/* SEED ciphersuites from RFC4162 */\r
-#define TLS1_TXT_RSA_WITH_SEED_SHA "SEED-SHA"\r
-#define TLS1_TXT_DH_DSS_WITH_SEED_SHA "DH-DSS-SEED-SHA"\r
-#define TLS1_TXT_DH_RSA_WITH_SEED_SHA "DH-RSA-SEED-SHA"\r
-#define TLS1_TXT_DHE_DSS_WITH_SEED_SHA "DHE-DSS-SEED-SHA"\r
-#define TLS1_TXT_DHE_RSA_WITH_SEED_SHA "DHE-RSA-SEED-SHA"\r
-#define TLS1_TXT_ADH_WITH_SEED_SHA "ADH-SEED-SHA"\r
+# define TLS1_TXT_RSA_WITH_SEED_SHA "SEED-SHA"\r
+# define TLS1_TXT_DH_DSS_WITH_SEED_SHA "DH-DSS-SEED-SHA"\r
+# define TLS1_TXT_DH_RSA_WITH_SEED_SHA "DH-RSA-SEED-SHA"\r
+# define TLS1_TXT_DHE_DSS_WITH_SEED_SHA "DHE-DSS-SEED-SHA"\r
+# define TLS1_TXT_DHE_RSA_WITH_SEED_SHA "DHE-RSA-SEED-SHA"\r
+# define TLS1_TXT_ADH_WITH_SEED_SHA "ADH-SEED-SHA"\r
\r
/* TLS v1.2 ciphersuites */\r
-#define TLS1_TXT_RSA_WITH_NULL_SHA256 "NULL-SHA256"\r
-#define TLS1_TXT_RSA_WITH_AES_128_SHA256 "AES128-SHA256"\r
-#define TLS1_TXT_RSA_WITH_AES_256_SHA256 "AES256-SHA256"\r
-#define TLS1_TXT_DH_DSS_WITH_AES_128_SHA256 "DH-DSS-AES128-SHA256"\r
-#define TLS1_TXT_DH_RSA_WITH_AES_128_SHA256 "DH-RSA-AES128-SHA256"\r
-#define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256 "DHE-DSS-AES128-SHA256"\r
-#define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256 "DHE-RSA-AES128-SHA256"\r
-#define TLS1_TXT_DH_DSS_WITH_AES_256_SHA256 "DH-DSS-AES256-SHA256"\r
-#define TLS1_TXT_DH_RSA_WITH_AES_256_SHA256 "DH-RSA-AES256-SHA256"\r
-#define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256 "DHE-DSS-AES256-SHA256"\r
-#define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256 "DHE-RSA-AES256-SHA256"\r
-#define TLS1_TXT_ADH_WITH_AES_128_SHA256 "ADH-AES128-SHA256"\r
-#define TLS1_TXT_ADH_WITH_AES_256_SHA256 "ADH-AES256-SHA256"\r
+# define TLS1_TXT_RSA_WITH_NULL_SHA256 "NULL-SHA256"\r
+# define TLS1_TXT_RSA_WITH_AES_128_SHA256 "AES128-SHA256"\r
+# define TLS1_TXT_RSA_WITH_AES_256_SHA256 "AES256-SHA256"\r
+# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA256 "DH-DSS-AES128-SHA256"\r
+# define TLS1_TXT_DH_RSA_WITH_AES_128_SHA256 "DH-RSA-AES128-SHA256"\r
+# define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256 "DHE-DSS-AES128-SHA256"\r
+# define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256 "DHE-RSA-AES128-SHA256"\r
+# define TLS1_TXT_DH_DSS_WITH_AES_256_SHA256 "DH-DSS-AES256-SHA256"\r
+# define TLS1_TXT_DH_RSA_WITH_AES_256_SHA256 "DH-RSA-AES256-SHA256"\r
+# define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256 "DHE-DSS-AES256-SHA256"\r
+# define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256 "DHE-RSA-AES256-SHA256"\r
+# define TLS1_TXT_ADH_WITH_AES_128_SHA256 "ADH-AES128-SHA256"\r
+# define TLS1_TXT_ADH_WITH_AES_256_SHA256 "ADH-AES256-SHA256"\r
\r
/* TLS v1.2 GCM ciphersuites from RFC5288 */\r
-#define TLS1_TXT_RSA_WITH_AES_128_GCM_SHA256 "AES128-GCM-SHA256"\r
-#define TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384 "AES256-GCM-SHA384"\r
-#define TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256 "DHE-RSA-AES128-GCM-SHA256"\r
-#define TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384 "DHE-RSA-AES256-GCM-SHA384"\r
-#define TLS1_TXT_DH_RSA_WITH_AES_128_GCM_SHA256 "DH-RSA-AES128-GCM-SHA256"\r
-#define TLS1_TXT_DH_RSA_WITH_AES_256_GCM_SHA384 "DH-RSA-AES256-GCM-SHA384"\r
-#define TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256 "DHE-DSS-AES128-GCM-SHA256"\r
-#define TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384 "DHE-DSS-AES256-GCM-SHA384"\r
-#define TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256 "DH-DSS-AES128-GCM-SHA256"\r
-#define TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384 "DH-DSS-AES256-GCM-SHA384"\r
-#define TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256 "ADH-AES128-GCM-SHA256"\r
-#define TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384 "ADH-AES256-GCM-SHA384"\r
+# define TLS1_TXT_RSA_WITH_AES_128_GCM_SHA256 "AES128-GCM-SHA256"\r
+# define TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384 "AES256-GCM-SHA384"\r
+# define TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256 "DHE-RSA-AES128-GCM-SHA256"\r
+# define TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384 "DHE-RSA-AES256-GCM-SHA384"\r
+# define TLS1_TXT_DH_RSA_WITH_AES_128_GCM_SHA256 "DH-RSA-AES128-GCM-SHA256"\r
+# define TLS1_TXT_DH_RSA_WITH_AES_256_GCM_SHA384 "DH-RSA-AES256-GCM-SHA384"\r
+# define TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256 "DHE-DSS-AES128-GCM-SHA256"\r
+# define TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384 "DHE-DSS-AES256-GCM-SHA384"\r
+# define TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256 "DH-DSS-AES128-GCM-SHA256"\r
+# define TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384 "DH-DSS-AES256-GCM-SHA384"\r
+# define TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256 "ADH-AES128-GCM-SHA256"\r
+# define TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384 "ADH-AES256-GCM-SHA384"\r
\r
/* ECDH HMAC based ciphersuites from RFC5289 */\r
\r
-#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256 "ECDHE-ECDSA-AES128-SHA256"\r
-#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384 "ECDHE-ECDSA-AES256-SHA384"\r
-#define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_SHA256 "ECDH-ECDSA-AES128-SHA256"\r
-#define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_SHA384 "ECDH-ECDSA-AES256-SHA384"\r
-#define TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256 "ECDHE-RSA-AES128-SHA256"\r
-#define TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384 "ECDHE-RSA-AES256-SHA384"\r
-#define TLS1_TXT_ECDH_RSA_WITH_AES_128_SHA256 "ECDH-RSA-AES128-SHA256"\r
-#define TLS1_TXT_ECDH_RSA_WITH_AES_256_SHA384 "ECDH-RSA-AES256-SHA384"\r
+# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256 "ECDHE-ECDSA-AES128-SHA256"\r
+# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384 "ECDHE-ECDSA-AES256-SHA384"\r
+# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_SHA256 "ECDH-ECDSA-AES128-SHA256"\r
+# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_SHA384 "ECDH-ECDSA-AES256-SHA384"\r
+# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256 "ECDHE-RSA-AES128-SHA256"\r
+# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384 "ECDHE-RSA-AES256-SHA384"\r
+# define TLS1_TXT_ECDH_RSA_WITH_AES_128_SHA256 "ECDH-RSA-AES128-SHA256"\r
+# define TLS1_TXT_ECDH_RSA_WITH_AES_256_SHA384 "ECDH-RSA-AES256-SHA384"\r
\r
/* ECDH GCM based ciphersuites from RFC5289 */\r
-#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "ECDHE-ECDSA-AES128-GCM-SHA256"\r
-#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "ECDHE-ECDSA-AES256-GCM-SHA384"\r
-#define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 "ECDH-ECDSA-AES128-GCM-SHA256"\r
-#define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 "ECDH-ECDSA-AES256-GCM-SHA384"\r
-#define TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "ECDHE-RSA-AES128-GCM-SHA256"\r
-#define TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "ECDHE-RSA-AES256-GCM-SHA384"\r
-#define TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256 "ECDH-RSA-AES128-GCM-SHA256"\r
-#define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384 "ECDH-RSA-AES256-GCM-SHA384"\r
-\r
-#define TLS_CT_RSA_SIGN 1\r
-#define TLS_CT_DSS_SIGN 2\r
-#define TLS_CT_RSA_FIXED_DH 3\r
-#define TLS_CT_DSS_FIXED_DH 4\r
-#define TLS_CT_ECDSA_SIGN 64\r
-#define TLS_CT_RSA_FIXED_ECDH 65\r
-#define TLS_CT_ECDSA_FIXED_ECDH 66\r
-#define TLS_CT_GOST94_SIGN 21\r
-#define TLS_CT_GOST01_SIGN 22\r
-/* when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see\r
- * comment there) */\r
-#define TLS_CT_NUMBER 9\r
-\r
-#define TLS1_FINISH_MAC_LENGTH 12\r
-\r
-#define TLS_MD_MAX_CONST_SIZE 20\r
-#define TLS_MD_CLIENT_FINISH_CONST "client finished"\r
-#define TLS_MD_CLIENT_FINISH_CONST_SIZE 15\r
-#define TLS_MD_SERVER_FINISH_CONST "server finished"\r
-#define TLS_MD_SERVER_FINISH_CONST_SIZE 15\r
-#define TLS_MD_SERVER_WRITE_KEY_CONST "server write key"\r
-#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16\r
-#define TLS_MD_KEY_EXPANSION_CONST "key expansion"\r
-#define TLS_MD_KEY_EXPANSION_CONST_SIZE 13\r
-#define TLS_MD_CLIENT_WRITE_KEY_CONST "client write key"\r
-#define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE 16\r
-#define TLS_MD_SERVER_WRITE_KEY_CONST "server write key"\r
-#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16\r
-#define TLS_MD_IV_BLOCK_CONST "IV block"\r
-#define TLS_MD_IV_BLOCK_CONST_SIZE 8\r
-#define TLS_MD_MASTER_SECRET_CONST "master secret"\r
-#define TLS_MD_MASTER_SECRET_CONST_SIZE 13\r
-\r
-#ifdef CHARSET_EBCDIC\r
-#undef TLS_MD_CLIENT_FINISH_CONST\r
-#define TLS_MD_CLIENT_FINISH_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x66\x69\x6e\x69\x73\x68\x65\x64" /*client finished*/\r
-#undef TLS_MD_SERVER_FINISH_CONST\r
-#define TLS_MD_SERVER_FINISH_CONST "\x73\x65\x72\x76\x65\x72\x20\x66\x69\x6e\x69\x73\x68\x65\x64" /*server finished*/\r
-#undef TLS_MD_SERVER_WRITE_KEY_CONST\r
-#define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79" /*server write key*/\r
-#undef TLS_MD_KEY_EXPANSION_CONST\r
-#define TLS_MD_KEY_EXPANSION_CONST "\x6b\x65\x79\x20\x65\x78\x70\x61\x6e\x73\x69\x6f\x6e" /*key expansion*/\r
-#undef TLS_MD_CLIENT_WRITE_KEY_CONST\r
-#define TLS_MD_CLIENT_WRITE_KEY_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79" /*client write key*/\r
-#undef TLS_MD_SERVER_WRITE_KEY_CONST\r
-#define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79" /*server write key*/\r
-#undef TLS_MD_IV_BLOCK_CONST\r
-#define TLS_MD_IV_BLOCK_CONST "\x49\x56\x20\x62\x6c\x6f\x63\x6b" /*IV block*/\r
-#undef TLS_MD_MASTER_SECRET_CONST\r
-#define TLS_MD_MASTER_SECRET_CONST "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74" /*master secret*/\r
-#endif\r
+# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "ECDHE-ECDSA-AES128-GCM-SHA256"\r
+# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "ECDHE-ECDSA-AES256-GCM-SHA384"\r
+# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 "ECDH-ECDSA-AES128-GCM-SHA256"\r
+# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 "ECDH-ECDSA-AES256-GCM-SHA384"\r
+# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "ECDHE-RSA-AES128-GCM-SHA256"\r
+# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "ECDHE-RSA-AES256-GCM-SHA384"\r
+# define TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256 "ECDH-RSA-AES128-GCM-SHA256"\r
+# define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384 "ECDH-RSA-AES256-GCM-SHA384"\r
+\r
+# define TLS_CT_RSA_SIGN 1\r
+# define TLS_CT_DSS_SIGN 2\r
+# define TLS_CT_RSA_FIXED_DH 3\r
+# define TLS_CT_DSS_FIXED_DH 4\r
+# define TLS_CT_ECDSA_SIGN 64\r
+# define TLS_CT_RSA_FIXED_ECDH 65\r
+# define TLS_CT_ECDSA_FIXED_ECDH 66\r
+# define TLS_CT_GOST94_SIGN 21\r
+# define TLS_CT_GOST01_SIGN 22\r
+/*\r
+ * when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see\r
+ * comment there)\r
+ */\r
+# define TLS_CT_NUMBER 9\r
+\r
+# define TLS1_FINISH_MAC_LENGTH 12\r
+\r
+# define TLS_MD_MAX_CONST_SIZE 20\r
+# define TLS_MD_CLIENT_FINISH_CONST "client finished"\r
+# define TLS_MD_CLIENT_FINISH_CONST_SIZE 15\r
+# define TLS_MD_SERVER_FINISH_CONST "server finished"\r
+# define TLS_MD_SERVER_FINISH_CONST_SIZE 15\r
+# define TLS_MD_SERVER_WRITE_KEY_CONST "server write key"\r
+# define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16\r
+# define TLS_MD_KEY_EXPANSION_CONST "key expansion"\r
+# define TLS_MD_KEY_EXPANSION_CONST_SIZE 13\r
+# define TLS_MD_CLIENT_WRITE_KEY_CONST "client write key"\r
+# define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE 16\r
+# define TLS_MD_SERVER_WRITE_KEY_CONST "server write key"\r
+# define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16\r
+# define TLS_MD_IV_BLOCK_CONST "IV block"\r
+# define TLS_MD_IV_BLOCK_CONST_SIZE 8\r
+# define TLS_MD_MASTER_SECRET_CONST "master secret"\r
+# define TLS_MD_MASTER_SECRET_CONST_SIZE 13\r
+\r
+# ifdef CHARSET_EBCDIC\r
+# undef TLS_MD_CLIENT_FINISH_CONST\r
+/*\r
+ * client finished\r
+ */\r
+# define TLS_MD_CLIENT_FINISH_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x66\x69\x6e\x69\x73\x68\x65\x64"\r
+\r
+# undef TLS_MD_SERVER_FINISH_CONST\r
+/*\r
+ * server finished\r
+ */\r
+# define TLS_MD_SERVER_FINISH_CONST "\x73\x65\x72\x76\x65\x72\x20\x66\x69\x6e\x69\x73\x68\x65\x64"\r
+\r
+# undef TLS_MD_SERVER_WRITE_KEY_CONST\r
+/*\r
+ * server write key\r
+ */\r
+# define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"\r
+\r
+# undef TLS_MD_KEY_EXPANSION_CONST\r
+/*\r
+ * key expansion\r
+ */\r
+# define TLS_MD_KEY_EXPANSION_CONST "\x6b\x65\x79\x20\x65\x78\x70\x61\x6e\x73\x69\x6f\x6e"\r
+\r
+# undef TLS_MD_CLIENT_WRITE_KEY_CONST\r
+/*\r
+ * client write key\r
+ */\r
+# define TLS_MD_CLIENT_WRITE_KEY_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"\r
+\r
+# undef TLS_MD_SERVER_WRITE_KEY_CONST\r
+/*\r
+ * server write key\r
+ */\r
+# define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"\r
+\r
+# undef TLS_MD_IV_BLOCK_CONST\r
+/*\r
+ * IV block\r
+ */\r
+# define TLS_MD_IV_BLOCK_CONST "\x49\x56\x20\x62\x6c\x6f\x63\x6b"\r
+\r
+# undef TLS_MD_MASTER_SECRET_CONST\r
+/*\r
+ * master secret\r
+ */\r
+# define TLS_MD_MASTER_SECRET_CONST "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"\r
+# endif\r
\r
/* TLS Session Ticket extension struct */\r
-struct tls_session_ticket_ext_st\r
- {\r
- unsigned short length;\r
- void *data;\r
- };\r
+struct tls_session_ticket_ext_st {\r
+ unsigned short length;\r
+ void *data;\r
+};\r
\r
#ifdef __cplusplus\r
}\r
OSDN Git Service
