From a6e7d1c0e3dbe3b1269814844594d47be9006de1 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sun, 8 Sep 2013 15:07:44 +0100
Subject: [PATCH] Document extension clash.

---
 CHANGES | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 715da13318..734c3752bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,14 +8,19 @@
     
      Experimental support for encrypt then mac from
      draft-gutmann-tls-encrypt-then-mac-02.txt
-    
+
      To enable it set the appropriate extension number (0x10 for the test
      server) using e.g. -DTLSEXT_TYPE_encrypt_then_mac=0x10
-    
+ 
      For non-compliant peers (i.e. just about everything) this should have no
      effect.
 
      WARNING: EXPERIMENTAL, SUBJECT TO CHANGE.
+
+     NOTE: unfortunately the test server value (0x10) clashes with the draft
+     ALPN extension. Until this is resolved the only way to check against the
+     test server is to temporarily change the ALPN extension value (ugh!).
+
      [Steve Henson]
 
   *) Add callbacks supporting generation and retrieval of supplemental
-- 
2.25.1