Follow-up for 1.0.1j upgrade, part 2
The error messages SSL_R_NO_P256_SUPPORT from an internal patch and
SSL_R_INAPPROPRIATE_FALLBACK from 1.0.1j upgrade conflict resulting in
weird error messages.
Tests were added to catch this regression in libcore change
If8896d8f644095c13cbe44dd8ba7d4ef235385cf
Bug: 18018599
Change-Id: I62e50f14a41a9f3b53afbbd6382800a6e18e55ec
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 7a1fce8..abc7b37 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2592,7 +2592,7 @@
#define SSL_R_NO_COMPRESSION_SPECIFIED 187
#define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER 330
#define SSL_R_NO_METHOD_SPECIFIED 188
-#define SSL_R_NO_P256_SUPPORT 373
+#define SSL_R_NO_P256_SUPPORT 380
#define SSL_R_NO_PRIVATEKEY 189
#define SSL_R_NO_PRIVATE_KEY_ASSIGNED 190
#define SSL_R_NO_PROTOCOLS_AVAILABLE 191
diff --git a/patches/0004-channelid.patch b/patches/0004-channelid.patch
index 48f875a..222fc35 100644
--- a/patches/0004-channelid.patch
+++ b/patches/0004-channelid.patch
@@ -878,7 +878,7 @@
#define SSL_R_NO_COMPRESSION_SPECIFIED 187
#define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER 330
#define SSL_R_NO_METHOD_SPECIFIED 188
-+#define SSL_R_NO_P256_SUPPORT 373
++#define SSL_R_NO_P256_SUPPORT 380
#define SSL_R_NO_PRIVATEKEY 189
#define SSL_R_NO_PRIVATE_KEY_ASSIGNED 190
#define SSL_R_NO_PROTOCOLS_AVAILABLE 191
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 7a1fce8..abc7b37 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2592,7 +2592,7 @@
#define SSL_R_NO_COMPRESSION_SPECIFIED 187
#define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER 330
#define SSL_R_NO_METHOD_SPECIFIED 188
-#define SSL_R_NO_P256_SUPPORT 373
+#define SSL_R_NO_P256_SUPPORT 380
#define SSL_R_NO_PRIVATEKEY 189
#define SSL_R_NO_PRIVATE_KEY_ASSIGNED 190
#define SSL_R_NO_PROTOCOLS_AVAILABLE 191
