Nils Larsch wrote:
  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Nils Larsch
  Root:   /e/openssl/cvs                   Email:  [EMAIL PROTECTED]
  Module: openssl                          Date:   08-Apr-2005 00:48:33
  Branch: HEAD                             Handle: 2005040723483300

  Modified files:
    openssl/apps            engine.c s_server.c

  Log:
    const fixes

  Summary:
    Revision    Changes     Path
    1.28        +1  -1      openssl/apps/engine.c
    1.92        +3  -3      openssl/apps/s_server.c
  ____________________________________________________________________________

patch -p0 <<'@@ .'
Index: openssl/apps/engine.c
============================================================================
$ cvs diff -u -r1.27 -r1.28 engine.c
--- openssl/apps/engine.c 5 Apr 2005 19:11:18 -0000 1.27
+++ openssl/apps/engine.c 7 Apr 2005 22:48:33 -0000 1.28
@@ -344,7 +344,7 @@
int MAIN(int argc, char **argv)
{
int ret=1,i;
- char **pp;
+ const char **pp;
int verbose=0, list_cap=0, test_avail=0, test_avail_noise = 0;
ENGINE *e;
STACK *engines = sk_new_null();
@@ .
patch -p0 <<'@@ .'
Index: openssl/apps/s_server.c
============================================================================
$ cvs diff -u -r1.91 -r1.92 s_server.c
--- openssl/apps/s_server.c 5 Apr 2005 19:11:18 -0000 1.91
+++ openssl/apps/s_server.c 7 Apr 2005 22:48:33 -0000 1.92
@@ -180,7 +180,7 @@
static int generate_session_id(const SSL *ssl, unsigned char *id,
unsigned int *id_len);
#ifndef OPENSSL_NO_DH
-static DH *load_dh_param(char *dhfile);
+static DH *load_dh_param(const char *dhfile);
static DH *get_dh512(void);
#endif
@@ -1465,12 +1465,12 @@
}
#ifndef OPENSSL_NO_DH
-static DH *load_dh_param(char *dhfile)
+static DH *load_dh_param(const char *dhfile)
{
DH *ret=NULL;
BIO *bio;
- if ((bio=BIO_new_file(dhfile,"r")) == NULL)
+ if ((bio=BIO_new_file((char *)dhfile,"r")) == NULL)

Gah! Don't do this - clearly this parameter is also const. Fix that instead.

--
http://www.apache-ssl.org/ben.html       http://www.thebunker.net/

"There is no limit to what a man can do or how far he can go if he
doesn't mind who gets the credit." - Robert Woodruff
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
Development Mailing List                       openssl-dev@openssl.org
Automated List Manager                           [EMAIL PROTECTED]

Reply via email to