d9719e1d52b657fec9bf6676c85a4d2458fd7e89 galt Thu Apr 27 15:54:31 2017 -0700 Remove optional compile switch USE_SSL so that openssl is now an official kent repo dependency. Also using openssl sha1 in hgTracks multiregion. refs #17358. diff --git src/lib/https.c src/lib/https.c index b944f37..5bf8b6a 100644 --- src/lib/https.c +++ src/lib/https.c @@ -1,22 +1,20 @@ /* Connect via https. */ /* Copyright (C) 2012 The Regents of the University of California * See README in this or parent directory for licensing information. */ -#ifdef USE_SSL - #include "openssl/ssl.h" #include "openssl/err.h" #include #include #include #include #include "common.h" #include "internet.h" #include "errAbort.h" #include "net.h" static pthread_mutex_t *mutexes = NULL; @@ -475,29 +473,15 @@ // We are trying something more subtle and library and thread-friendly instead. int rc; rc = pthread_create(¶ms->thread, NULL, netConnectHttpsThread, (void *)params); if (rc) { errAbort("Unexpected error %d from pthread_create(): %s",rc,strerror(rc)); } /* parent */ return params->sv[0]; } -#else - -#include -#include "common.h" -#include "errAbort.h" - -int netConnectHttps(char *hostName, int port, boolean noProxy) -/* Start https connection with server or die. */ -{ -errAbort("No openssl available in netConnectHttps for %s : %d", hostName, port); -return -1; /* will never get to here, make compiler happy */ -} - -#endif