1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Commit Graph

36 Commits

Author SHA1 Message Date
William A. Rowe Jr
fb9c4b137c Based on list discussion between myself and Geoff, it seems prudent
to check for both the existence of the openssl/engine.h header file
  and some 'expected function' such as ENGINE_init() (better suggestions
  are welcome.)  Also clear up some confusion; so long as we have
  ENGINE_load_builtin_engines() we should attempt to preload those.

  This patch protects all ENGINE-based code within the tests for the
  engine header and function, and changes a version test into a
  function test.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100104 13f79535-47bb-0310-9956-ffa450edef68
2003-05-30 18:41:53 +00:00
William A. Rowe Jr
26f1ba8050 The patch below reverts the prior commit to eliminate SSL_set_state().
Some additional work or research is required in order to pass the
  perl-framework regressions, but I don't have the cycles and don't
  care to leave the broken code in cvs HEAD.

REVERTING: wrowe 2003/05/19 08:13:19

  Modified:    modules/ssl config.m4 ssl_engine_io.c ssl_engine_kernel.c
                        ssl_toolkit_compat.h
  Log:
    Drop SSL_set_state() in favor of a proper SSL_renegotiate() to begin
    rehandshaking the SSL connection, vis-a-vis ApacheSSL.

  Revision  Changes    Path
  1.15      +0 -1      httpd-2.0/modules/ssl/config.m4
  1.108     +1 -1      httpd-2.0/modules/ssl/ssl_engine_io.c
  1.93      +1 -1      httpd-2.0/modules/ssl/ssl_engine_kernel.c
  1.34      +0 -6      httpd-2.0/modules/ssl/ssl_toolkit_compat.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100004 13f79535-47bb-0310-9956-ffa450edef68
2003-05-22 19:41:32 +00:00
William A. Rowe Jr
1a6f1ae739 Drop SSL_set_state() in favor of a proper SSL_renegotiate() to begin
rehandshaking the SSL connection, vis-a-vis ApacheSSL.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99921 13f79535-47bb-0310-9956-ffa450edef68
2003-05-19 15:13:19 +00:00
William A. Rowe Jr
a5708f15e6 Roll away the SSL_EXPERIMENTAL_ENGINE test in favor of testing for the
ENGINE_init() function in config.m4, and rely on HAVE_ENGINE_INIT instead.

Reviewed by: Ben Laurie (concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99919 13f79535-47bb-0310-9956-ffa450edef68
2003-05-19 14:48:47 +00:00
Jeff Trawick
85d6c41e63 tweak the const-ness of MODSSL_INFO_CB_ARG_TYPE based on the OpenSSL
version

this resolves some warnings with RH 8 (OpenSSL 0.9.6)
and some errors with AIX's native compiler (OpenSSL 0.9.6)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99678 13f79535-47bb-0310-9956-ffa450edef68
2003-05-01 13:10:36 +00:00
William A. Rowe Jr
474812c956 Solve SSL-C breakage introduced in mod_ssl.h rev 1.129 and
ssl_engine_kernel.c rev 1.88.  SSL* is not const under SSL-C.

  I've confirmed Jeff's comment that the original patch doesn't harm
  earlier OpenSSL versions which declared no arguments at all.

  I suspect now that we could fold
     #define MODSSL_BIO_CB_ARG_TYPE const char
     #define MODSSL_CRYPTO_CB_ARG_TYPE const char
     #define MODSSL_INFO_CB_ARG_TYPE const SSL*
  into a single MODSSL_CB_ARG_CONST define, but this works for now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99263 13f79535-47bb-0310-9956-ffa450edef68
2003-04-05 22:45:28 +00:00
William A. Rowe Jr
e25454c894 Introduce a number of SSLC hints to mod_ssl, including the following
type overrides;

    MODSSL_CLIENT_CERT_CB_ARG_TYPE
    MODSSL_PCHAR_CAST      (for a host of non-void/const sslc values)
    modssl_read_bio_cb_fn  (for several callbacks with same prototypes)

  Declare callback functions appropriately.

  And protect us from indetermineant toolkits with
  #error "Unrecognized SSL Toolkit!"


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99183 13f79535-47bb-0310-9956-ffa450edef68
2003-04-03 04:54:20 +00:00
Madhusudan Mathihalli
aea3ed09fb OpenSSL should be included as "openssl/ssl.h" and not "ssl.h" (and rely on the
INCLUDE path to be defined properly)

PR: 11310
Submitted by: Geoff Thrope <geoff@geoffthrope.net>
Reviewed by: Madhusudan Mathihalli


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99008 13f79535-47bb-0310-9956-ffa450edef68
2003-03-14 02:20:50 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
Jeff Trawick
5b745920ed fix the interface to PEM_read_bio_X509() with OpenSSL versions older than 0.9.4.
Submitted by:	Madhu Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97308 13f79535-47bb-0310-9956-ffa450edef68
2002-10-25 22:03:52 +00:00
Jeff Trawick
8a0bef5873 mod_ssl uses free() inappropriately in several places, to free
memory which has been previously allocated inside OpenSSL.
Such memory should be freed with OPENSSL_free(), not with free().

Submitted by: Nadav Har'El <nyh@math.technion.ac.il>,
              Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97307 13f79535-47bb-0310-9956-ffa450edef68
2002-10-25 21:44:28 +00:00
William A. Rowe Jr
37fb026ce1 Small fixes for SSLC
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96477 13f79535-47bb-0310-9956-ffa450edef68
2002-08-21 19:12:46 +00:00
Doug MacEachern
140006b5b1 add/use EVP_PKEY_reference_inc and X509_reference_inc compat macros
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
2002-03-30 08:11:44 +00:00
Doug MacEachern
d019ceb174 add sslc compat for sk_X509_INFO_free
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94340 13f79535-47bb-0310-9956-ffa450edef68
2002-03-30 07:42:30 +00:00
Doug MacEachern
e430071911 enable/cleanup SSL_X509_INFO_load_{file,path} functions for use in
proxy context


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94323 13f79535-47bb-0310-9956-ffa450edef68
2002-03-30 01:41:35 +00:00
Doug MacEachern
a24fd6a181 cleanup the proxy context
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94288 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 02:59:27 +00:00
Doug MacEachern
030ac064a5 add license
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94239 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 22:31:33 +00:00
Doug MacEachern
aeb7f9eb0b add configure checks for ssl functions:
-SSL_set_state: macro in OpenSSL, might be a function in a patched sslc
-SSL_set_cert_store: patch submitted to OpenSSL, might be applied to
OpenSSL or sslc


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94223 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 17:02:56 +00:00
Doug MacEachern
1a827bfe96 fix doofo in last commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94218 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 06:01:03 +00:00
Doug MacEachern
33922c86be sslc 1.x does not have an x509v3.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94217 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 05:58:31 +00:00
Doug MacEachern
979adbad8a sslc does not currently support X509V3_EXT_d2i
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94216 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 05:50:56 +00:00
Doug MacEachern
c88a192813 toolkit compat for PEM_read_bio_PrivateKey
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94215 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 04:02:46 +00:00
Doug MacEachern
9614067815 toolkit compat for PEM_read_bio_X509
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94213 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:56:02 +00:00
Doug MacEachern
0f2dbb97e8 adjust to another const char vs char mismatch between OpenSSL and sslc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94212 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:46:36 +00:00
Doug MacEachern
5b74033b80 typo fix s/EDG/EGD/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94210 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:33:57 +00:00
Doug MacEachern
20ed127171 modssl_set_cipher_list was in the wrong place for OpenSSL
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94209 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:31:23 +00:00
Doug MacEachern
49e69c7029 RAND_status macro was in the wrong place
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94208 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:28:52 +00:00
Doug MacEachern
008b963af9 sslc does not currently support RAND_egd or RAND_status
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94207 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:27:13 +00:00
Doug MacEachern
fecf892d82 in sslc PEM_F_DEF_CALLBACK == PEM_F_DEF_CB
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94206 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:13:32 +00:00
Doug MacEachern
e6392769aa 2nd arg to SSL_set_cipher_list in sslc is char *
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94205 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:11:22 +00:00
Doug MacEachern
66419ef565 sslc 1.x SSL_set_verify only takes 2 args
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94204 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:09:11 +00:00
Doug MacEachern
642262e204 sslc does not currently implement an SSL_set_state function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94203 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:04:24 +00:00
Doug MacEachern
7f4a6ff760 sslc adds a second, unused param to X509_verify_cert
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94202 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:02:10 +00:00
Doug MacEachern
11cf72871b sslc does not have a safestack.h, implement a minimal subset required
for mod_ssl


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94201 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 02:53:38 +00:00
Doug MacEachern
2eefae08bd some compat macros for sslc 1.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94200 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 02:50:43 +00:00
Doug MacEachern
1d2a39531c moving OpenSSL+sslc compat foo to ssl_toolkit_compat.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94199 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 02:28:15 +00:00