From b8d826f243803c7a2234f0d038ce182d91df3967 Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Tue, 26 Apr 2005 14:41:41 -0700
Subject: [PATCH] [svn] Renamed src/gen_sslfunc.c to src/openssl.c and
 src/gen_sslfunc.h to src/ssl.h.

---
 configure.in                     | 2 +-
 src/ChangeLog                    | 6 ++++++
 src/Makefile.in                  | 6 +++---
 src/http.c                       | 2 +-
 src/{gen_sslfunc.c => openssl.c} | 4 ++--
 src/{gen_sslfunc.h => ssl.h}     | 0
 windows/Makefile.src             | 4 ++--
 windows/Makefile.src.mingw       | 2 +-
 8 files changed, 16 insertions(+), 10 deletions(-)
 rename src/{gen_sslfunc.c => openssl.c} (99%)
 rename src/{gen_sslfunc.h => ssl.h} (100%)

diff --git a/configure.in b/configure.in
index becfba3c..ecc45824 100644
--- a/configure.in
+++ b/configure.in
@@ -406,7 +406,7 @@ main(){return 0;}
     AC_DEFINE([HAVE_SSL], 1,
               [Define if SSL support should be compiled in.])
     AC_SUBST(SSL_INCLUDES)
-    SSL_OBJ='gen_sslfunc$o'
+    SSL_OBJ='openssl$o'
     AC_SUBST(SSL_OBJ)
   else
     LDFLAGS=$wget_save_LDFLAGS
diff --git a/src/ChangeLog b/src/ChangeLog
index 79ce80e0..a6d30758 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-26  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* openssl.c: Renamed "gen_sslfunc.c" to "openssl.c" and
+	"gen_sslfunc.h" to "openssl.h".  This reflects the intent of
+	openssl.c encapsulating the OpenSSL-specific code.
+
 2005-04-26  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* init.c: Renamed "closure" (a synonym for context in some
diff --git a/src/Makefile.in b/src/Makefile.in
index 048b9a78..2a575d28 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -166,7 +166,7 @@ ftp-opie$o: wget.h sysdep.h options.h safe-ctype.h gen-md5.h
 ftp$o: wget.h sysdep.h options.h safe-ctype.h utils.h url.h retr.h \
 	ftp.h host.h connect.h netrc.h
 gen-md5$o: wget.h sysdep.h options.h safe-ctype.h gen-md5.h
-gen_sslfunc$o: wget.h sysdep.h options.h safe-ctype.h utils.h connect.h host.h \
+openssl$o: wget.h sysdep.h options.h safe-ctype.h utils.h connect.h host.h \
 	url.h
 getopt$o: wget.h sysdep.h options.h safe-ctype.h getopt.h
 gnu-md5$o: wget.h sysdep.h options.h safe-ctype.h gnu-md5.h
@@ -175,13 +175,13 @@ host$o: wget.h sysdep.h options.h safe-ctype.h utils.h host.h url.h hash.h
 html-parse$o: wget.h sysdep.h options.h safe-ctype.h html-parse.h
 html-url$o: wget.h sysdep.h options.h safe-ctype.h html-parse.h url.h utils.h
 http$o: wget.h sysdep.h options.h safe-ctype.h utils.h url.h host.h \
-	retr.h connect.h host.h netrc.h gen_sslfunc.h \
+	retr.h connect.h host.h netrc.h ssl.h \
 	cookies.h gen-md5.h
 init$o: wget.h sysdep.h options.h safe-ctype.h utils.h init.h host.h recur.h \
 	netrc.h cookies.h progress.h
 log$o: wget.h sysdep.h options.h safe-ctype.h utils.h
 main$o: wget.h sysdep.h options.h safe-ctype.h utils.h init.h retr.h \
-	recur.h host.h cookies.h url.h progress.h gen_sslfunc.h getopt.h
+	recur.h host.h cookies.h url.h progress.h ssl.h getopt.h
 gnu-md5$o: wget.h sysdep.h options.h safe-ctype.h gnu-md5.h
 mswindows$o: wget.h sysdep.h options.h safe-ctype.h utils.h url.h
 netrc$o: wget.h sysdep.h options.h safe-ctype.h utils.h netrc.h init.h
diff --git a/src/http.c b/src/http.c
index ae68c6fb..6fb2b743 100644
--- a/src/http.c
+++ b/src/http.c
@@ -64,7 +64,7 @@ extern int errno;
 #include "connect.h"
 #include "netrc.h"
 #ifdef HAVE_SSL
-# include "gen_sslfunc.h"
+# include "ssl.h"
 #endif
 #ifdef ENABLE_NTLM
 # include "http-ntlm.h"
diff --git a/src/gen_sslfunc.c b/src/openssl.c
similarity index 99%
rename from src/gen_sslfunc.c
rename to src/openssl.c
index 2d908c32..664ed1e6 100644
--- a/src/gen_sslfunc.c
+++ b/src/openssl.c
@@ -53,7 +53,7 @@ so, delete this exception statement from your version.  */
 #include "utils.h"
 #include "connect.h"
 #include "url.h"
-#include "gen_sslfunc.h"
+#include "ssl.h"
 
 #ifndef errno
 extern int errno;
@@ -213,7 +213,7 @@ ssl_init ()
 
   if (opt.cert_file != NULL || opt.cert_key != NULL)
     {
-      int ssl_cert_type;
+      int ssl_cert_type = SSL_FILETYPE_PEM;
       switch (opt.cert_type)
 	{
 	case cert_type_pem:
diff --git a/src/gen_sslfunc.h b/src/ssl.h
similarity index 100%
rename from src/gen_sslfunc.h
rename to src/ssl.h
diff --git a/windows/Makefile.src b/windows/Makefile.src
index 14d9a7a8..632079c5 100644
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -32,8 +32,8 @@
 !ifndef NO_SSL
 SSLDEFS	= /DHAVE_SSL
 SSLLIBS	= libeay32.lib ssleay32.lib
-SSLSRC	= gen_sslfunc.c http-ntlm.c
-SSLOBJ	= gen_sslfunc$o http-ntlm$o
+SSLSRC	= openssl.c http-ntlm.c
+SSLOBJ	= openssl$o http-ntlm$o
 !endif
 
 o = .obj
diff --git a/windows/Makefile.src.mingw b/windows/Makefile.src.mingw
index 2d247ed2..5188c440 100644
--- a/windows/Makefile.src.mingw
+++ b/windows/Makefile.src.mingw
@@ -33,7 +33,7 @@ ifdef SSL
     OPENSSL_PATH = ../../openssl-0.9.7c
     CFLAGS += -I${OPENSSL_PATH}/outinc -DHAVE_SSL
     LIBS += -L${OPENSSL_PATH}/out -leay32 -lssl32
-    OBJS += gen_sslfunc${OBJ_EXT} http-ntlm${OBJ_EXT}
+    OBJS += openssl${OBJ_EXT} http-ntlm${OBJ_EXT}
 endif
 
 all: wget.exe