Revert of New tls channel id version for OpenSSL

openssl/ssl/tls1.h

 /* ssl/tls1.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 237 matching lines @@
 
 /* Temporary extension type */
 #define TLSEXT_TYPE_renegotiate                 0xff01
 
 #ifndef OPENSSL_NO_NEXTPROTONEG
 /* This is not an IANA defined extension number */
 #define TLSEXT_TYPE_next_proto_neg              13172
 #endif
 
 /* This is not an IANA defined extension number */
-#define TLSEXT_TYPE_channel_id                  30032
+#define TLSEXT_TYPE_channel_id                  30031
 
 /* NameType value from RFC 3546 */
 #define TLSEXT_NAMETYPE_host_name 0
 /* status request value from RFC 3546 */
 #define TLSEXT_STATUSTYPE_ocsp 1
 
 /* ECPointFormat values from draft-ietf-tls-ecc-12 */
 #define TLSEXT_ECPOINTFORMAT_first                      0
 #define TLSEXT_ECPOINTFORMAT_uncompressed               0
 #define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime  1
@@ skipping 474 matching lines @@
 struct tls_session_ticket_ext_st
         {
         unsigned short length;
         void *data;
         };
 
 #ifdef  __cplusplus
 }
 #endif
 #endif