Changeset: fbdc08904de5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fbdc08904de5
Modified Files:
clients/mapilib/Tests/tlssecurity.py
clients/mapilib/connect_openssl.c
Branch: monetdburl
Log Message:
Temporarily disable sending the ALPN header
It broke the systemcertificates.py test which currently relies
on connecting to an HTTPS server and expecting a protocol
failure but not a TLS failure.
diffs (36 lines):
diff --git a/clients/mapilib/Tests/tlssecurity.py
b/clients/mapilib/Tests/tlssecurity.py
--- a/clients/mapilib/Tests/tlssecurity.py
+++ b/clients/mapilib/Tests/tlssecurity.py
@@ -172,7 +172,10 @@ attempt('connect_server_name', 'sni', No
# indicates that the implementation succesfully negotiated ALPN protocol
# "mapi/9".
-attempt('connect_alpn_mapi9', 'alpn_mapi9', None, cert=certpath('ca1.crt'))
+####### Temporarily disable the ALPN header.
+####### TODO re-enable it when test systemcertificates.py no longer relies
+####### on connecting to an HTTPS server. (Which is an ugly hack in the first
place!)
+# attempt('connect_alpn_mapi9', 'alpn_mapi9', None, cert=certpath('ca1.crt'))
# connect_right_hash
#
diff --git a/clients/mapilib/connect_openssl.c
b/clients/mapilib/connect_openssl.c
--- a/clients/mapilib/connect_openssl.c
+++ b/clients/mapilib/connect_openssl.c
@@ -265,12 +265,17 @@ wrap_tls(Mapi mid, SOCKET sock)
return croak_openssl(mid, __func__, "SSL_set_tlsext_host_name");
}
+ // Temporarily disable the ALPN header.
+ // TODO re-enable it when test systemcertificates.py no longer relies
+ // on connecting to an HTTPS server. (Which is an ugly hack in the
first place!)
+#if 0
unsigned char alpn_vector[] = { 6, 'm', 'a', 'p', 'i', '/', '9' };
// NOTE: these functions return 0 on success, not 1!
if (0 != SSL_set_alpn_protos(ssl, alpn_vector, sizeof(alpn_vector))) {
BIO_free_all(bio);
return croak_openssl(mid, __func__, "SSL_set_alpn_protos");
}
+#endif
assert(clientkey);
assert(clientcert);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
