From 13962adcb55a676b0b47925680b2e17b3e4815f0 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 28 Sep 2000 10:26:44 +0000 Subject: 7.3 commit --- lib/Makefile.am | 5 +++-- lib/Makefile.in | 6 +++--- lib/http.c | 2 +- lib/url.c | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/Makefile.am b/lib/Makefile.am index 52b741771..88e36b356 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,7 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign no-dependencies +AUTOMAKE_OPTIONS = foreign lib_LTLIBRARIES = libcurl.la @@ -23,7 +23,8 @@ download.c getdate.h ldap.c ssluse.c version.c \ download.h getenv.c ldap.h ssluse.h \ escape.c getenv.h mprintf.c telnet.c \ escape.h getpass.c netrc.c telnet.h \ -writeout.c writeout.h highlevel.c strequal.c strequal.h easy.c +writeout.c writeout.h highlevel.c strequal.c strequal.h easy.c \ +security.h security.c krb4.c # Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule. $(srcdir)/getdate.c: getdate.y diff --git a/lib/Makefile.in b/lib/Makefile.in index a88678ecb..b793969aa 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -77,7 +77,7 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ YACC = @YACC@ -AUTOMAKE_OPTIONS = foreign no-dependencies +AUTOMAKE_OPTIONS = foreign lib_LTLIBRARIES = libcurl.la @@ -86,7 +86,7 @@ lib_LTLIBRARIES = libcurl.la INCLUDES = -I$(top_srcdir)/include -libcurl_la_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h dict.h getdate.c if2ip.h speedcheck.h urldata.h download.c getdate.h ldap.c ssluse.c version.c download.h getenv.c ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c telnet.h writeout.c writeout.h highlevel.c strequal.c strequal.h easy.c +libcurl_la_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h dict.h getdate.c if2ip.h speedcheck.h urldata.h download.c getdate.h ldap.c ssluse.c version.c download.h getenv.c ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c telnet.h writeout.c writeout.h highlevel.c strequal.c strequal.h easy.c security.h security.c krb4.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h ../src/config.h @@ -104,7 +104,7 @@ libcurl_la_OBJECTS = file.lo timeval.lo base64.lo hostip.lo progress.lo \ formdata.lo cookie.lo http.lo sendf.lo ftp.lo url.lo dict.lo if2ip.lo \ speedcheck.lo getdate.lo download.lo ldap.lo ssluse.lo version.lo \ getenv.lo escape.lo mprintf.lo telnet.lo getpass.lo netrc.lo \ -writeout.lo highlevel.lo strequal.lo easy.lo +writeout.lo highlevel.lo strequal.lo easy.lo security.lo krb4.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/lib/http.c b/lib/http.c index d4a3da1c0..4e3471b36 100644 --- a/lib/http.c +++ b/lib/http.c @@ -295,7 +295,7 @@ CURLcode http(struct connectdata *conn) !data->auth_host || strequal(data->auth_host, data->hostname)) { sprintf(data->buffer, "%s:%s", data->user, data->passwd); - if(base64Encode(data->buffer, 0, /* size zero makes it do strlen() */ + if(base64_encode(data->buffer, strlen(data->buffer), &authorization) >= 0) { data->ptr_userpwd = maprintf( "Authorization: Basic %s\015\012", authorization); diff --git a/lib/url.c b/lib/url.c index f3231436a..4ddafc182 100644 --- a/lib/url.c +++ b/lib/url.c @@ -1392,7 +1392,8 @@ CURLcode curl_connect(CURL *curl, CURLconnect **in_connect) if(data->bits.proxy_user_passwd) { char *authorization; sprintf(data->buffer, "%s:%s", data->proxyuser, data->proxypasswd); - if(base64Encode(data->buffer, 0, &authorization) >= 0) { + if(base64_encode(data->buffer, strlen(data->buffer), + &authorization) >= 0) { data->ptr_proxyuserpwd = maprintf("Proxy-authorization: Basic %s\015\012", authorization); free(authorization); -- cgit v1.2.3