Lines 121-130
Link Here
|
121 |
#define MODSSL_D2I_ASN1_type_bytes_CONST const |
121 |
#define MODSSL_D2I_ASN1_type_bytes_CONST const |
122 |
#define MODSSL_D2I_PrivateKey_CONST const |
122 |
#define MODSSL_D2I_PrivateKey_CONST const |
123 |
#define MODSSL_D2I_X509_CONST const |
123 |
#define MODSSL_D2I_X509_CONST const |
|
|
124 |
#define MODSSL_D2I_DHparams_CONST const |
124 |
#else |
125 |
#else |
125 |
#define MODSSL_D2I_ASN1_type_bytes_CONST |
126 |
#define MODSSL_D2I_ASN1_type_bytes_CONST |
126 |
#define MODSSL_D2I_PrivateKey_CONST |
127 |
#define MODSSL_D2I_PrivateKey_CONST |
127 |
#define MODSSL_D2I_X509_CONST |
128 |
#define MODSSL_D2I_X509_CONST |
|
|
129 |
#define MODSSL_D2I_DHparams_CONST |
128 |
#endif |
130 |
#endif |
129 |
|
131 |
|
130 |
#if OPENSSL_VERSION_NUMBER >= 0x00908080 && !defined(OPENSSL_NO_OCSP) \ |
132 |
#if OPENSSL_VERSION_NUMBER >= 0x00908080 && !defined(OPENSSL_NO_OCSP) \ |
Lines 526-531
Link Here
|
526 |
* example the string "vhost.example.com:443:RSA". */ |
528 |
* example the string "vhost.example.com:443:RSA". */ |
527 |
apr_hash_t *tPublicCert; |
529 |
apr_hash_t *tPublicCert; |
528 |
apr_hash_t *tPrivateKey; |
530 |
apr_hash_t *tPrivateKey; |
|
|
531 |
apr_hash_t *tDHParams; |
529 |
|
532 |
|
530 |
#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT) |
533 |
#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT) |
531 |
const char *szCryptoDevice; |
534 |
const char *szCryptoDevice; |
Lines 552-562
Link Here
|
552 |
* unordered lists. */ |
555 |
* unordered lists. */ |
553 |
const char *cert_files[SSL_AIDX_MAX]; |
556 |
const char *cert_files[SSL_AIDX_MAX]; |
554 |
const char *key_files[SSL_AIDX_MAX]; |
557 |
const char *key_files[SSL_AIDX_MAX]; |
|
|
558 |
const char *dhparams_file; |
555 |
/* Loaded certs and keys; these arrays ARE indexed by the |
559 |
/* Loaded certs and keys; these arrays ARE indexed by the |
556 |
* algorithm type, i.e. keys[SSL_AIDX_RSA] maps to the RSA |
560 |
* algorithm type, i.e. keys[SSL_AIDX_RSA] maps to the RSA |
557 |
* private key. */ |
561 |
* private key. */ |
558 |
X509 *certs[SSL_AIDX_MAX]; |
562 |
X509 *certs[SSL_AIDX_MAX]; |
559 |
EVP_PKEY *keys[SSL_AIDX_MAX]; |
563 |
EVP_PKEY *keys[SSL_AIDX_MAX]; |
|
|
564 |
DH *dhparams; |
560 |
|
565 |
|
561 |
/** Certificates which specify the set of CA names which should be |
566 |
/** Certificates which specify the set of CA names which should be |
562 |
* sent in the CertificateRequest message: */ |
567 |
* sent in the CertificateRequest message: */ |
Lines 711-716
Link Here
|
711 |
const char *ssl_cmd_SSLRandomSeed(cmd_parms *, void *, const char *, const char *, const char *); |
716 |
const char *ssl_cmd_SSLRandomSeed(cmd_parms *, void *, const char *, const char *, const char *); |
712 |
const char *ssl_cmd_SSLEngine(cmd_parms *, void *, const char *); |
717 |
const char *ssl_cmd_SSLEngine(cmd_parms *, void *, const char *); |
713 |
const char *ssl_cmd_SSLCipherSuite(cmd_parms *, void *, const char *); |
718 |
const char *ssl_cmd_SSLCipherSuite(cmd_parms *, void *, const char *); |
|
|
719 |
const char *ssl_cmd_SSLDHParametersFile(cmd_parms *, void *, const char *); |
714 |
const char *ssl_cmd_SSLCertificateFile(cmd_parms *, void *, const char *); |
720 |
const char *ssl_cmd_SSLCertificateFile(cmd_parms *, void *, const char *); |
715 |
const char *ssl_cmd_SSLCertificateKeyFile(cmd_parms *, void *, const char *); |
721 |
const char *ssl_cmd_SSLCertificateKeyFile(cmd_parms *, void *, const char *); |
716 |
const char *ssl_cmd_SSLCertificateChainFile(cmd_parms *, void *, const char *); |
722 |
const char *ssl_cmd_SSLCertificateChainFile(cmd_parms *, void *, const char *); |