mirror of
https://github.com/apache/httpd.git
synced 2026-01-26 19:01:35 +03:00
140006b5b1
to get these changes working with sslc git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94341 13f79535-47bb-0310-9956-ffa450edef68
206 lines
6.8 KiB
C
206 lines
6.8 KiB
C
/* ====================================================================
|
|
* The Apache Software License, Version 1.1
|
|
*
|
|
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights
|
|
* reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* 3. The end-user documentation included with the redistribution,
|
|
* if any, must include the following acknowledgment:
|
|
* "This product includes software developed by the
|
|
* Apache Software Foundation (http://www.apache.org/)."
|
|
* Alternately, this acknowledgment may appear in the software itself,
|
|
* if and wherever such third-party acknowledgments normally appear.
|
|
*
|
|
* 4. The names "Apache" and "Apache Software Foundation" must
|
|
* not be used to endorse or promote products derived from this
|
|
* software without prior written permission. For written
|
|
* permission, please contact apache@apache.org.
|
|
*
|
|
* 5. Products derived from this software may not be called "Apache",
|
|
* nor may "Apache" appear in their name, without prior written
|
|
* permission of the Apache Software Foundation.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
|
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
* ====================================================================
|
|
*/
|
|
|
|
#ifndef SSL_TOOLKIT_COMPAT_H
|
|
#define SSL_TOOLKIT_COMPAT_H
|
|
|
|
/*
|
|
* this header file provides a compatiblity layer
|
|
* between OpenSSL and RSA sslc
|
|
*/
|
|
|
|
#ifdef OPENSSL_VERSION_NUMBER
|
|
|
|
/*
|
|
* rsa sslc uses incomplete types for most structures
|
|
* so we macroize for OpenSSL those which cannot be dereferenced
|
|
* using the same sames as the sslc functions
|
|
*/
|
|
|
|
#define EVP_PKEY_key_type(k) (EVP_PKEY_type(k->type))
|
|
|
|
#define X509_NAME_get_entries(xs) (xs->entries)
|
|
#define X509_REVOKED_get_serialNumber(xs) (xs->serialNumber)
|
|
|
|
#define X509_get_signature_algorithm(xs) (xs->cert_info->signature->algorithm)
|
|
#define X509_get_key_algorithm(xs) (xs->cert_info->key->algor->algorithm)
|
|
|
|
#define X509_NAME_ENTRY_get_data_ptr(xs) (xs->value->data)
|
|
#define X509_NAME_ENTRY_get_data_len(xs) (xs->value->length)
|
|
|
|
#define SSL_CTX_get_extra_certs(ctx) (ctx->extra_certs)
|
|
#define SSL_CTX_set_extra_certs(ctx,value) {ctx->extra_certs = value;}
|
|
|
|
#define SSL_CIPHER_get_name(s) (s->name)
|
|
#define SSL_CIPHER_get_valid(s) (s->valid)
|
|
|
|
#define SSL_SESSION_get_session_id(s) (s->session_id)
|
|
#define SSL_SESSION_get_session_id_length(s) (s->session_id_length)
|
|
|
|
/*
|
|
* Support for retrieving/overriding states
|
|
*/
|
|
#ifndef SSL_get_state
|
|
#define SSL_get_state(ssl) SSL_state(ssl)
|
|
#endif
|
|
|
|
#define SSL_set_state(ssl,val) (ssl)->state = val
|
|
|
|
#define MODSSL_BIO_CB_ARG_TYPE const char
|
|
#define MODSSL_CRYPTO_CB_ARG_TYPE const char
|
|
|
|
#define modssl_X509_verify_cert X509_verify_cert
|
|
|
|
#define modssl_PEM_read_bio_X509 PEM_read_bio_X509
|
|
|
|
#define modssl_PEM_X509_INFO_read_bio PEM_X509_INFO_read_bio
|
|
|
|
#define modssl_PEM_read_bio_PrivateKey PEM_read_bio_PrivateKey
|
|
|
|
#define modssl_set_cipher_list SSL_set_cipher_list
|
|
|
|
#define EVP_PKEY_reference_inc(pkey) \
|
|
CRYPTO_add(&((pkey)->references), +1, CRYPTO_LOCK_X509_PKEY)
|
|
|
|
#define X509_reference_inc(cert) \
|
|
CRYPTO_add(&((cert)->references), +1, CRYPTO_LOCK_X509)
|
|
|
|
#define HAVE_SSL_RAND_EGD /* since 9.5.1 */
|
|
|
|
#define HAVE_SSL_X509V3_EXT_d2i
|
|
|
|
#else /* RSA sslc */
|
|
|
|
/* sslc does not support this function, OpenSSL has since 9.5.1 */
|
|
#define RAND_status() 1
|
|
|
|
#ifndef STACK_OF
|
|
#define STACK_OF(type) STACK
|
|
#endif
|
|
|
|
#define MODSSL_BIO_CB_ARG_TYPE char
|
|
#define MODSSL_CRYPTO_CB_ARG_TYPE char
|
|
|
|
#define modssl_X509_verify_cert(c) X509_verify_cert(c, NULL)
|
|
|
|
#define modssl_PEM_read_bio_X509(b, x, cb, arg) \
|
|
PEM_read_bio_X509(b, x, cb)
|
|
|
|
#define modssl_PEM_X509_INFO_read_bio(b, x, cb, arg)\
|
|
PEM_X509_INFO_read_bio(b, x, cb)
|
|
|
|
#define modssl_PEM_read_bio_PrivateKey(b, k, cb, arg) \
|
|
PEM_read_bio_PrivateKey(b, k, cb)
|
|
|
|
#ifndef HAVE_SSL_SET_STATE
|
|
#define SSL_set_state(ssl, state) /* XXX: should throw an error */
|
|
#endif
|
|
|
|
#define modssl_set_cipher_list(ssl, l) \
|
|
SSL_set_cipher_list(ssl, (char *)l)
|
|
|
|
#ifndef PEM_F_DEF_CALLBACK
|
|
#define PEM_F_DEF_CALLBACK PEM_F_DEF_CB
|
|
#endif
|
|
|
|
#if SSLC_VERSION < 0x2000
|
|
|
|
#define X509_STORE_CTX_set_depth(st, d)
|
|
#define X509_CRL_get_lastUpdate(x) ((x)->crl->lastUpdate)
|
|
#define X509_CRL_get_nextUpdate(x) ((x)->crl->nextUpdate)
|
|
#define X509_CRL_get_REVOKED(x) ((x)->crl->revoked)
|
|
#define X509_REVOKED_get_serialNumber(xs) (xs->serialNumber)
|
|
|
|
#define modssl_set_verify(ssl, verify, cb) \
|
|
SSL_set_verify(ssl, verify)
|
|
|
|
#define NO_SSL_X509V3_H
|
|
|
|
#endif
|
|
|
|
/* BEGIN GENERATED SECTION */
|
|
#define sk_SSL_CIPHER_free sk_free
|
|
#define sk_SSL_CIPHER_dup sk_dup
|
|
#define sk_SSL_CIPHER_num sk_num
|
|
#define sk_SSL_CIPHER_find(st, data) sk_find(st, (void *)data)
|
|
#define sk_SSL_CIPHER_value (SSL_CIPHER *)sk_value
|
|
#define sk_X509_num sk_num
|
|
#define sk_X509_value (X509 *)sk_value
|
|
#define sk_X509_INFO_value (X509_INFO *)sk_value
|
|
#define sk_X509_INFO_free sk_free
|
|
#define sk_X509_INFO_pop_free sk_pop_free
|
|
#define sk_X509_INFO_num sk_num
|
|
#define sk_X509_INFO_new_null sk_new_null
|
|
#define sk_X509_NAME_num sk_num
|
|
#define sk_X509_NAME_push(st, data) sk_push(st, (void *)data)
|
|
#define sk_X509_NAME_value (X509_NAME *)sk_value
|
|
#define sk_X509_NAME_free sk_free
|
|
#define sk_X509_NAME_new sk_new
|
|
#define sk_X509_NAME_find(st, data) sk_find(st, (void *)data)
|
|
#define sk_X509_NAME_ENTRY_num sk_num
|
|
#define sk_X509_NAME_ENTRY_value (X509_NAME_ENTRY *)sk_value
|
|
#define sk_X509_NAME_set_cmp_func sk_set_cmp_func
|
|
#define sk_X509_REVOKED_num sk_num
|
|
#define sk_X509_REVOKED_value (X509_REVOKED *)sk_value
|
|
#define sk_X509_pop_free sk_pop_free
|
|
/* END GENERATED SECTION */
|
|
|
|
#endif /* OPENSSL_VERSION_NUMBER */
|
|
|
|
#ifndef modssl_set_verify
|
|
#define modssl_set_verify(ssl, verify, cb) \
|
|
SSL_set_verify(ssl, verify, cb)
|
|
#endif
|
|
|
|
#ifndef NO_SSL_X509V3_H
|
|
#define HAVE_SSL_X509V3_H
|
|
#endif
|
|
|
|
#endif /* SSL_TOOLKIT_COMPAT_H */
|