Commit b1c7fc05 authored by Nick Zitzmann's avatar Nick Zitzmann
Browse files

By request, change the name of "curl_darwinssl.[ch]" to "darwinssl.[ch]"

parent fce3f8f4

lib/Makefile.inc

+2 −2
Original line number Original line Diff line number Diff line
@@ -22,11 +22,11 @@ 




LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c     \

LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c     \

  vtls/polarssl.c vtls/polarssl_threadlock.c vtls/axtls.c               \

  vtls/polarssl.c vtls/polarssl_threadlock.c vtls/axtls.c               \

  vtls/cyassl.c vtls/schannel.c vtls/curl_darwinssl.c vtls/gskit.c

  vtls/cyassl.c vtls/schannel.c vtls/darwinssl.c vtls/gskit.c





LIB_VTLS_HFILES = vtls/openssl.h vtls/vtls.h vtls/gtls.h                \

LIB_VTLS_HFILES = vtls/openssl.h vtls/vtls.h vtls/gtls.h                \

  vtls/nssg.h vtls/polarssl.h vtls/polarssl_threadlock.h vtls/axtls.h   \

  vtls/nssg.h vtls/polarssl.h vtls/polarssl_threadlock.h vtls/axtls.h   \

  vtls/cyassl.h vtls/schannel.h vtls/curl_darwinssl.h vtls/gskit.h

  vtls/cyassl.h vtls/schannel.h vtls/darwinssl.h vtls/gskit.h





LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c   \

LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c   \

  cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c       \

  cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c       \

lib/Makefile.vc6

+1 −1
Original line number Original line Diff line number Diff line
@@ -534,7 +534,6 @@ X_OBJS= \ 
	$(DIROBJ)\content_encoding.obj \

	$(DIROBJ)\content_encoding.obj \

	$(DIROBJ)\cookie.obj \

	$(DIROBJ)\cookie.obj \

	$(DIROBJ)\curl_addrinfo.obj \

	$(DIROBJ)\curl_addrinfo.obj \

	$(DIROBJ)\curl_darwinssl.obj \

	$(DIROBJ)\curl_des.obj \

	$(DIROBJ)\curl_des.obj \

	$(DIROBJ)\curl_endian.obj \

	$(DIROBJ)\curl_endian.obj \

	$(DIROBJ)\curl_fnmatch.obj \

	$(DIROBJ)\curl_fnmatch.obj \
@@ -553,6 +552,7 @@ X_OBJS= \ 
	$(DIROBJ)\curl_sspi.obj \

	$(DIROBJ)\curl_sspi.obj \

	$(DIROBJ)\curl_threads.obj \

	$(DIROBJ)\curl_threads.obj \

	$(DIROBJ)\cyassl.obj \

	$(DIROBJ)\cyassl.obj \

	$(DIROBJ)\darwinlssl.obj

	$(DIROBJ)\dict.obj \

	$(DIROBJ)\dict.obj \

	$(DIROBJ)\dotdot.obj \

	$(DIROBJ)\dotdot.obj \

	$(DIROBJ)\easy.obj \

	$(DIROBJ)\easy.obj \

lib/vtls/curl_darwinssl.c→lib/vtls/darwinssl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ 
#include "connect.h"

#include "connect.h"

#include "select.h"

#include "select.h"

#include "vtls.h"

#include "vtls.h"

#include "curl_darwinssl.h"

#include "darwinssl.h"





#define _MPRINTF_REPLACE /* use our functions only */

#define _MPRINTF_REPLACE /* use our functions only */

#include <curl/mprintf.h>

#include <curl/mprintf.h>

lib/vtls/curl_darwinssl.h→lib/vtls/darwinssl.h

+0 −0

File moved.

View file

lib/vtls/vtls.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include "axtls.h"          /* axTLS versions */

#include "axtls.h"          /* axTLS versions */

#include "cyassl.h"         /* CyaSSL versions */

#include "cyassl.h"         /* CyaSSL versions */

#include "schannel.h"       /* Schannel SSPI version */

#include "schannel.h"       /* Schannel SSPI version */

#include "curl_darwinssl.h" /* SecureTransport (Darwin) version */

#include "darwinssl.h"      /* SecureTransport (Darwin) version */





#ifndef MAX_PINNED_PUBKEY_SIZE

#ifndef MAX_PINNED_PUBKEY_SIZE

#define MAX_PINNED_PUBKEY_SIZE 1048576 /* 1MB */

#define MAX_PINNED_PUBKEY_SIZE 1048576 /* 1MB */