Author: billbarker Date: Fri Jan 22 02:36:00 2016 New Revision: 1726137 URL: http://svn.apache.org/viewvc?rev=1726137&view=rev Log: OpenSSL master has changed EVP_PKEY to an abstract type
Modified: tomcat/native/trunk/native/src/sslutils.c Modified: tomcat/native/trunk/native/src/sslutils.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=1726137&r1=1726136&r2=1726137&view=diff ============================================================================== --- tomcat/native/trunk/native/src/sslutils.c (original) +++ tomcat/native/trunk/native/src/sslutils.c Fri Jan 22 02:36:00 2016 @@ -213,7 +213,11 @@ EC_GROUP *SSL_ec_GetParamFromFile(const DH *SSL_callback_tmp_DH(SSL *ssl, int export, int keylen) { EVP_PKEY *pkey = SSL_get_privatekey(ssl); - int type = pkey ? EVP_PKEY_type(pkey->type) : EVP_PKEY_NONE; +#if OPENSSL_VERSION_NUMBER < 0x10100000L + int type = pkey != NULL ? EVP_PKEY_type(pkey->type) : EVP_PKEY_NONE; +#else + int type = pkey != NULL ? EVP_PKEY_base_id(pkey) : EVP_PKEY_NONE; +#endif /* * OpenSSL will call us with either keylen == 512 or keylen == 1024 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org