Updated OpenSSL, because Google Play complains about it's version

2015-05-13 20:16:23 +03:00
parent 351e3773f1
commit 6e9af1b599
40 changed files with 308 additions and 370 deletions
--- a/project/jni/openssl/include/openssl/bio.h
+++ b/project/jni/openssl/include/openssl/bio.h
@@ -266,6 +266,9 @@ void BIO_clear_flags(BIO *b, int flags);
 #define BIO_RR_CONNECT			0x02
 /* Returned from the accept BIO when an accept would have blocked */
 #define BIO_RR_ACCEPT			0x03
+/* Returned from the SSL bio when the channel id retrieval code cannot find the
+ * private key. */
+#define BIO_RR_SSL_CHANNEL_ID_LOOKUP	0x04

 /* These are passed by the BIO callback */
 #define BIO_CB_FREE	0x01