mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
The development trunk of OpenSSL has tightened up the type safety of the STACK construct
and the functions that manipulate it. Make httpd trunk compile against OpenSSL HEAD as well as OpenSSL 0.9.8j. Also, get rid of some warnings. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@748396 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -250,7 +250,7 @@ int ssl_hook_Access(request_rec *r)
|
||||
X509_STORE *cert_store = NULL;
|
||||
X509_STORE_CTX cert_store_ctx;
|
||||
STACK_OF(SSL_CIPHER) *cipher_list_old = NULL, *cipher_list = NULL;
|
||||
SSL_CIPHER *cipher = NULL;
|
||||
const SSL_CIPHER *cipher = NULL;
|
||||
int depth, verify_old, verify, n;
|
||||
|
||||
if (ssl) {
|
||||
@@ -657,7 +657,7 @@ int ssl_hook_Access(request_rec *r)
|
||||
* sk_X509_shift-ed the peer cert out of the chain.
|
||||
* we put it back here for the purpose of quick_renegotiation.
|
||||
*/
|
||||
cert_stack = sk_new_null();
|
||||
cert_stack = sk_X509_new_null();
|
||||
sk_X509_push(cert_stack, MODSSL_PCHAR_CAST cert);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user