Author: billbarker Date: Thu Jan 21 02:47:08 2016 New Revision: 1725859 URL: http://svn.apache.org/viewvc?rev=1725859&view=rev Log: OpenSSL master has changed EVP_PKEY to an abstract type
Modified: tomcat/native/branches/1.1.x/native/src/sslutils.c Modified: tomcat/native/branches/1.1.x/native/src/sslutils.c URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslutils.c?rev=1725859&r1=1725858&r2=1725859&view=diff ============================================================================== --- tomcat/native/branches/1.1.x/native/src/sslutils.c (original) +++ tomcat/native/branches/1.1.x/native/src/sslutils.c Thu Jan 21 02:47:08 2016 @@ -192,8 +192,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 * (see the definition of SSL_EXPORT_PKEYLENGTH in ssl_locl.h). --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org