Author: rjung
Date: Wed Mar 23 09:05:37 2016
New Revision: 1736292
URL: http://svn.apache.org/viewvc?rev=1736292&view=rev
Log:
Support for OpenSSL 1.1.0:
- X509_PUBKEY is now opaque.
Alternative API exists since 1.0.1.
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=1736292&r1=1736291&r2=1736292&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslinfo.c (original)
+++ tomcat/native/trunk/native/src/sslinfo.c Wed Mar 23 09:05:37 2016
@@ -376,6 +376,7 @@ TCN_IMPLEMENT_CALL(jstring, SSLSocket, g
}
else if (what & SSL_INFO_CLIENT_MASK) {
X509 *xs;
+ ASN1_OBJECT *paobj;
char *result;
int nid;
if ((xs = SSL_get_peer_certificate(s->ssl)) != NULL) {
@@ -400,7 +401,8 @@ TCN_IMPLEMENT_CALL(jstring, SSLSocket, g
value = tcn_new_string(e, OBJ_nid2ln(nid));
break;
case SSL_INFO_CLIENT_A_KEY:
- nid = OBJ_obj2nid((ASN1_OBJECT
*)(X509_get_X509_PUBKEY(xs)->algor->algorithm));
+ X509_PUBKEY_get0_param(&paobj, NULL, 0, NULL,
X509_get_X509_PUBKEY(xs));
+ nid = OBJ_obj2nid(paobj);
if (nid == NID_undef)
value = tcn_new_string(e, "UNKNOWN");
else
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
