1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

[svn] Renamed src/gen_sslfunc.c to src/openssl.c and src/gen_sslfunc.h to

src/ssl.h.
This commit is contained in:
hniksic 2005-04-26 14:41:41 -07:00
parent a15ce4fbe4
commit b8d826f243
8 changed files with 16 additions and 10 deletions

View File

@ -406,7 +406,7 @@ main(){return 0;}
AC_DEFINE([HAVE_SSL], 1, AC_DEFINE([HAVE_SSL], 1,
[Define if SSL support should be compiled in.]) [Define if SSL support should be compiled in.])
AC_SUBST(SSL_INCLUDES) AC_SUBST(SSL_INCLUDES)
SSL_OBJ='gen_sslfunc$o' SSL_OBJ='openssl$o'
AC_SUBST(SSL_OBJ) AC_SUBST(SSL_OBJ)
else else
LDFLAGS=$wget_save_LDFLAGS LDFLAGS=$wget_save_LDFLAGS

View File

@ -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> 2005-04-26 Hrvoje Niksic <hniksic@xemacs.org>
* init.c: Renamed "closure" (a synonym for context in some * init.c: Renamed "closure" (a synonym for context in some

View File

@ -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$o: wget.h sysdep.h options.h safe-ctype.h utils.h url.h retr.h \
ftp.h host.h connect.h netrc.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-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 url.h
getopt$o: wget.h sysdep.h options.h safe-ctype.h getopt.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 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-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 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 \ 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 cookies.h gen-md5.h
init$o: wget.h sysdep.h options.h safe-ctype.h utils.h init.h host.h recur.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 netrc.h cookies.h progress.h
log$o: wget.h sysdep.h options.h safe-ctype.h utils.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 \ 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 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 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 netrc$o: wget.h sysdep.h options.h safe-ctype.h utils.h netrc.h init.h

View File

@ -64,7 +64,7 @@ extern int errno;
#include "connect.h" #include "connect.h"
#include "netrc.h" #include "netrc.h"
#ifdef HAVE_SSL #ifdef HAVE_SSL
# include "gen_sslfunc.h" # include "ssl.h"
#endif #endif
#ifdef ENABLE_NTLM #ifdef ENABLE_NTLM
# include "http-ntlm.h" # include "http-ntlm.h"

View File

@ -53,7 +53,7 @@ so, delete this exception statement from your version. */
#include "utils.h" #include "utils.h"
#include "connect.h" #include "connect.h"
#include "url.h" #include "url.h"
#include "gen_sslfunc.h" #include "ssl.h"
#ifndef errno #ifndef errno
extern int errno; extern int errno;
@ -213,7 +213,7 @@ ssl_init ()
if (opt.cert_file != NULL || opt.cert_key != NULL) if (opt.cert_file != NULL || opt.cert_key != NULL)
{ {
int ssl_cert_type; int ssl_cert_type = SSL_FILETYPE_PEM;
switch (opt.cert_type) switch (opt.cert_type)
{ {
case cert_type_pem: case cert_type_pem:

View File

@ -32,8 +32,8 @@
!ifndef NO_SSL !ifndef NO_SSL
SSLDEFS = /DHAVE_SSL SSLDEFS = /DHAVE_SSL
SSLLIBS = libeay32.lib ssleay32.lib SSLLIBS = libeay32.lib ssleay32.lib
SSLSRC = gen_sslfunc.c http-ntlm.c SSLSRC = openssl.c http-ntlm.c
SSLOBJ = gen_sslfunc$o http-ntlm$o SSLOBJ = openssl$o http-ntlm$o
!endif !endif
o = .obj o = .obj

View File

@ -33,7 +33,7 @@ ifdef SSL
OPENSSL_PATH = ../../openssl-0.9.7c OPENSSL_PATH = ../../openssl-0.9.7c
CFLAGS += -I${OPENSSL_PATH}/outinc -DHAVE_SSL CFLAGS += -I${OPENSSL_PATH}/outinc -DHAVE_SSL
LIBS += -L${OPENSSL_PATH}/out -leay32 -lssl32 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 endif
all: wget.exe all: wget.exe