httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_toolkit_compat.h ssl_util_ssl.c
Date Wed, 27 Mar 2002 04:02:46 GMT
dougm       02/03/26 20:02:46

  Modified:    modules/ssl ssl_toolkit_compat.h ssl_util_ssl.c
  Log:
  toolkit compat for PEM_read_bio_PrivateKey
  
  Revision  Changes    Path
  1.15      +5 -0      httpd-2.0/modules/ssl/ssl_toolkit_compat.h
  
  Index: ssl_toolkit_compat.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_toolkit_compat.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ssl_toolkit_compat.h	27 Mar 2002 03:56:02 -0000	1.14
  +++ ssl_toolkit_compat.h	27 Mar 2002 04:02:46 -0000	1.15
  @@ -50,6 +50,8 @@
   
   #define modssl_PEM_read_bio_X509 PEM_read_bio_X509
   
  +#define modssl_PEM_read_bio_PrivateKey PEM_read_bio_PrivateKey
  +
   #define modssl_set_cipher_list SSL_set_cipher_list
   
   #define HAVE_SSL_RAND_EGD /* since 9.5.1 */
  @@ -70,6 +72,9 @@
   
   #define modssl_PEM_read_bio_X509(b, x, cb, arg) \
      PEM_read_bio_X509(b, x, cb)
  +
  +#define modssl_PEM_read_bio_PrivateKey(b, k, cb, arg) \
  +   PEM_read_bio_PrivateKey(b, k, cb)
   
   /* XXX: add configure check */
   #ifndef HAVE_SSL_SET_STATE
  
  
  
  1.16      +1 -1      httpd-2.0/modules/ssl/ssl_util_ssl.c
  
  Index: ssl_util_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util_ssl.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ssl_util_ssl.c	27 Mar 2002 03:58:26 -0000	1.15
  +++ ssl_util_ssl.c	27 Mar 2002 04:02:46 -0000	1.16
  @@ -166,7 +166,7 @@
       /* 1. try PEM (= DER+Base64+headers) */
          if ((bioS=BIO_new_file(filename, "r")) == NULL)
                  return NULL;
  -       rc = PEM_read_bio_PrivateKey(bioS, key, cb, s);
  +       rc = modssl_PEM_read_bio_PrivateKey(bioS, key, cb, s);
          BIO_free(bioS);
   
       if (rc == NULL) {
  
  
  

Mime
View raw message