simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #296 from tickelton/fix_disable-ssl

Browse source 
Fix build with --disable-ssl
This commit is contained in:
Luka Krajger 2015-05-02 16:37:53 +02:00
commit 170704671c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libhttp/ssl.c
View file

@ -590,7 +590,6 @@ static int sslSetCertificateFromFile(SSL_CTX *context,
int rc = sslSetCertificateFromFd(context, fd); int rc = sslSetCertificateFromFd(context, fd);
return rc; return rc;
} }
#endif
static SSL_CTX *sslMakeContext(void) { static SSL_CTX *sslMakeContext(void) {
SSL_CTX *context; SSL_CTX *context;
@ -617,6 +616,7 @@ static SSL_CTX *sslMakeContext(void) {
check(SSL_CTX_set_cipher_list(context, "HIGH:MEDIUM:!aNULL:!MD5")); check(SSL_CTX_set_cipher_list(context, "HIGH:MEDIUM:!aNULL:!MD5"));
return context; return context;
} }
#endif
#ifdef HAVE_TLSEXT #ifdef HAVE_TLSEXT
static int sslSNICallback(SSL *sslHndl, int *al ATTR_UNUSED, static int sslSNICallback(SSL *sslHndl, int *al ATTR_UNUSED,