From 0a5c466761a0f033e8756d1548d6b26822f79750 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Tue, 25 Aug 2015 14:11:30 +0300 Subject: [PATCH] Revert "tls: add Server Key Exchange message" This reverts commit 99fd57e0a8fadcaef6bfe20a03b9a0e2c6933102. We no longer support ECDHE_RSA and therefore we will no longer receive such messages. --- src/core/sipe-tls.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/core/sipe-tls.c b/src/core/sipe-tls.c index 23f4c884..0a1b4145 100644 --- a/src/core/sipe-tls.c +++ b/src/core/sipe-tls.c @@ -130,7 +130,6 @@ struct tls_internal_state { #define TLS_HANDSHAKE_TYPE_CLIENT_HELLO 1 #define TLS_HANDSHAKE_TYPE_SERVER_HELLO 2 #define TLS_HANDSHAKE_TYPE_CERTIFICATE 11 -#define TLS_HANDSHAKE_TYPE_SERVER_KEY_EXCHANGE 12 #define TLS_HANDSHAKE_TYPE_CERTIFICATE_REQ 13 #define TLS_HANDSHAKE_TYPE_SERVER_HELLO_DONE 14 #define TLS_HANDSHAKE_TYPE_CERTIFICATE_VERIFY 15 @@ -731,22 +730,13 @@ static const struct msg_descriptor Certificate_m = { &ServerHello_m, "Certificate", Certificate_l, TLS_HANDSHAKE_TYPE_CERTIFICATE }; -/* we only support ECDHE */ -static const struct layout_descriptor ServerKeyExchange_l[] = { - { "EC Curve Type", parse_integer, NULL, 0, 1, 0 }, - TLS_LAYOUT_DESCRIPTOR_END -}; -static const struct msg_descriptor ServerKeyExchange_m = { - &Certificate_m, "Server Key Exchange", ServerKeyExchange_l, TLS_HANDSHAKE_TYPE_SERVER_KEY_EXCHANGE -}; - static const struct layout_descriptor CertificateRequest_l[] = { { "CertificateType", parse_vector, NULL, 1, TLS_VECTOR_MAX8, 0 }, { "DistinguishedName", parse_vector, NULL, 0, TLS_VECTOR_MAX16, 0 }, TLS_LAYOUT_DESCRIPTOR_END }; static const struct msg_descriptor CertificateRequest_m = { - &ServerKeyExchange_m, "Certificate Request", CertificateRequest_l, TLS_HANDSHAKE_TYPE_CERTIFICATE_REQ + &Certificate_m, "Certificate Request", CertificateRequest_l, TLS_HANDSHAKE_TYPE_CERTIFICATE_REQ }; static const struct layout_descriptor ServerHelloDone_l[] = { -- 2.11.4.GIT