httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/support ab.c
Date Sat, 03 Aug 2002 22:00:23 GMT
wrowe       2002/08/03 15:00:23

  Modified:    support  ab.c
  Log:
    Support rsaref compilation
  
  Revision  Changes    Path
  1.115     +22 -6     httpd-2.0/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.c,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- ab.c	30 Jul 2002 13:00:33 -0000	1.114
  +++ ab.c	3 Aug 2002 22:00:23 -0000	1.115
  @@ -470,14 +470,14 @@
       {
           BIO_printf(out,"read from %08X [%08lX] (%d bytes => %ld (0x%X))\n",
                   bio,argp,argi,ret,ret);
  -        BIO_dump(out,argp,(int)ret);
  +        BIO_dump(out,(char *)argp,(int)ret);
           return(ret);
       }
       else if (cmd == (BIO_CB_WRITE|BIO_CB_RETURN))
       {
           BIO_printf(out,"write to %08X [%08lX] (%d bytes => %ld (0x%X))\n",
               bio,argp,argi,ret,ret);
  -        BIO_dump(out,argp,(int)ret);
  +        BIO_dump(out,(char *)argp,(int)ret);
       }
       return(ret);
   }
  @@ -588,7 +588,11 @@
   {
       BIO *bio;
       X509 *x509cert;
  +#ifdef RSAREF
  +    STACK *sk;
  +#else
       STACK_OF(X509) *sk;
  +#endif
       int i, count, hdone = 0;
       char ssl_hostname[80];
       
  @@ -632,7 +636,7 @@
       if (verbosity >= 4)
       {
           BIO_set_callback(bio,ssl_print_cb);
  -        BIO_set_callback_arg(bio,bio_err);
  +        BIO_set_callback_arg(bio,(void*)bio_err);
       }
   
       while (!hdone)
  @@ -673,11 +677,19 @@
       {
           BIO_printf(bio_err, "\n");
           sk = SSL_get_peer_cert_chain(c->ssl);
  +#ifdef RSAREF
  +        if ((count = sk_num(sk)) > 0)
  +#else
           if ((count = sk_X509_num(sk)) > 0)
  +#endif
           {
               for (i=1; i<count; i++)
               {
  +#ifdef RSAREF
  +                x509cert = (X509 *)sk_value(sk,i);
  +#else
                   x509cert = (X509 *)sk_X509_value(sk,i);
  +#endif
                   ssl_print_cert_info(bio_out,x509cert);
                   X509_free(x509cert);
               }
  @@ -2110,7 +2122,11 @@
   	heartbeatres = 0;
   
   #ifdef USE_SSL
  -    CRYPTO_malloc_init();
  +#ifdef RSAREF
  +    R_malloc_init();
  +#else
  +    SSL_malloc_init();
  +#endif
       SSL_load_error_strings();
       SSL_library_init();
       bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
  
  
  

Mime
View raw message