Author: markt
Date: Wed Aug 23 11:49:53 2017
New Revision: 1805885
URL: http://svn.apache.org/viewvc?rev=1805885&view=rev
Log:
Fix remaining LibreSSL warnings
Modified:
tomcat/native/trunk/native/src/sslinfo.c
Modified: tomcat/native/trunk/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1805885&r1=1805884&r2=1805885&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslinfo.c (original)
+++ tomcat/native/trunk/native/src/sslinfo.c Wed Aug 23 11:49:53 2017
@@ -394,11 +394,15 @@ TCN_IMPLEMENT_CALL(jstring, SSLSocket, g
}
break;
case SSL_INFO_CLIENT_A_SIG:
+#if defined(LIBRESSL_VERSION_NUMBER)
+ value = tcn_new_string(e, "UNKNOWN");
+#else
nid = X509_get_signature_nid(xs);
if (nid == NID_undef)
value = tcn_new_string(e, "UNKNOWN");
else
value = tcn_new_string(e, OBJ_nid2ln(nid));
+#endif
break;
case SSL_INFO_CLIENT_A_KEY:
X509_PUBKEY_get0_param(&paobj, NULL, 0, NULL,
X509_get_X509_PUBKEY(xs));
@@ -445,11 +449,15 @@ TCN_IMPLEMENT_CALL(jstring, SSLSocket, g
}
break;
case SSL_INFO_SERVER_A_SIG:
+#if defined(LIBRESSL_VERSION_NUMBER)
+ value = tcn_new_string(e, "UNKNOWN");
+#else
nid = X509_get_signature_nid(xs);
if (nid == NID_undef)
value = tcn_new_string(e, "UNKNOWN");
else
value = tcn_new_string(e, OBJ_nid2ln(nid));
+#endif
break;
case SSL_INFO_SERVER_A_KEY:
X509_PUBKEY_get0_param(&paobj, NULL, 0, NULL,
X509_get_X509_PUBKEY(xs));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
