From e7bdc26218b2f0fa323778de1ff1449f4c5f5a52 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Wed, 6 Jan 2016 10:02:28 -0800 Subject: Check for RFC 5746 TLS extension RFC 5746 allows you to either include a signaling cipher suite or a TLS extension. However, since TLS API has no way to indicate or check that a certain TLS extension is used, we insert it into the cipher suites we see to check against the enabled cipher suites. (cherry picked from commit 81885494e46596c796cdcb5037b91d92915b65a7) Bug: 24602368 Change-Id: I06422b9a90f47bb5ffa10ef614233d856773d336 --- support/src/test/java/libcore/tlswire/handshake/HelloExtension.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'support/src/test/java/libcore') diff --git a/support/src/test/java/libcore/tlswire/handshake/HelloExtension.java b/support/src/test/java/libcore/tlswire/handshake/HelloExtension.java index 5741072..a648cdf 100644 --- a/support/src/test/java/libcore/tlswire/handshake/HelloExtension.java +++ b/support/src/test/java/libcore/tlswire/handshake/HelloExtension.java @@ -31,6 +31,7 @@ public class HelloExtension { public static final int TYPE_SERVER_NAME = 0; public static final int TYPE_PADDING = 21; public static final int TYPE_SESSION_TICKET = 35; + public static final int TYPE_RENEGOTIATION_INFO = 65281; private static final Map TYPE_TO_NAME = new HashMap(); static { @@ -60,7 +61,7 @@ public class HelloExtension { TYPE_TO_NAME.put(13172, "next_protocol_negotiation"); TYPE_TO_NAME.put(30031, "Channel ID (old)"); TYPE_TO_NAME.put(30032, "Channel ID (new)"); - TYPE_TO_NAME.put(65281, "renegotiation_info"); + TYPE_TO_NAME.put(TYPE_RENEGOTIATION_INFO, "renegotiation_info"); } public int type; -- cgit v1.1