lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2026-01-27 08:02:47 +03:00
Code Activity

Moved ssl_use_pem_file to own file

Browse Source
This commit is contained in:
Lammert Bies
2016-12-09 01:43:25 +01:00
parent 3fb3f241ee
commit 974e2c6b77
3 changed files with 67 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -67,6 +67,7 @@ LIB_SOURCES = src/libhttp.c \
src/httplib_set_sock_timeout.c \
src/httplib_set_tcp_nodelay.c \
src/httplib_ssl_get_protocol.c \
src/httplib_ssl_use_pem_file.c \
src/httplib_start.c \
src/httplib_stop.c \
src/httplib_uninitialize_ssl.c \

66
src/httplib_ssl_use_pem_file.c Normal file
View File

@@ -0,0 +1,66 @@
/*
* Copyright (C) 2016 Lammert Bies
* Copyright (c) 2013-2016 the Civetweb developers
* Copyright (c) 2004-2013 Sergey Lyubka
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "libhttp-private.h"
/*
* int XX_httplib_ssl_use_pem_file( struct mg_context *ctx, const char *pem );
*
* The function XX_httplib_ssl_use_pem_file() tries to use a certificate which
* is passed as a parameter with the filename of the certificate.
*/
#if ! defined(NO_SSL)
int XX_httplib_ssl_use_pem_file( struct mg_context *ctx, const char *pem ) {
if (SSL_CTX_use_certificate_file(ctx->ssl_ctx, pem, 1) == 0) {
mg_cry( XX_httplib_fc(ctx), "%s: cannot open certificate file %s: %s", __func__, pem, XX_httplib_ssl_error());
return 0;
}
/* could use SSL_CTX_set_default_passwd_cb_userdata */
if (SSL_CTX_use_PrivateKey_file(ctx->ssl_ctx, pem, 1) == 0) {
mg_cry( XX_httplib_fc(ctx), "%s: cannot open private key file %s: %s", __func__, pem, XX_httplib_ssl_error());
return 0;
}
if (SSL_CTX_check_private_key(ctx->ssl_ctx) == 0) {
mg_cry( XX_httplib_fc(ctx), "%s: certificate and private key do not match: %s", __func__, pem);
return 0;
}
if (SSL_CTX_use_certificate_chain_file(ctx->ssl_ctx, pem) == 0) {
mg_cry( XX_httplib_fc(ctx), "%s: cannot use certificate chain file %s: %s", __func__, pem, XX_httplib_ssl_error());
return 0;
}
return 1;
} /* XX_httplib_ssl_use_pem_file */
#endif /* !NO_SSL */

27
src/libhttp.c
View File

@@ -8728,31 +8728,4 @@ int XX_httplib_initialize_ssl( struct mg_context *ctx ) {
} /* XX_httplib_initialize_ssl */
int XX_httplib_ssl_use_pem_file( struct mg_context *ctx, const char *pem ) {
if (SSL_CTX_use_certificate_file(ctx->ssl_ctx, pem, 1) == 0) {
mg_cry( XX_httplib_fc(ctx), "%s: cannot open certificate file %s: %s", __func__, pem, XX_httplib_ssl_error());
return 0;
}
/* could use SSL_CTX_set_default_passwd_cb_userdata */
if (SSL_CTX_use_PrivateKey_file(ctx->ssl_ctx, pem, 1) == 0) {
mg_cry( XX_httplib_fc(ctx), "%s: cannot open private key file %s: %s", __func__, pem, XX_httplib_ssl_error());
return 0;
}
if (SSL_CTX_check_private_key(ctx->ssl_ctx) == 0) {
mg_cry( XX_httplib_fc(ctx), "%s: certificate and private key do not match: %s", __func__, pem);
return 0;
}
if (SSL_CTX_use_certificate_chain_file(ctx->ssl_ctx, pem) == 0) {
mg_cry( XX_httplib_fc(ctx), "%s: cannot use certificate chain file %s: %s", __func__, pem, XX_httplib_ssl_error());
return 0;
}
return 1;
} /* XX_httplib_ssl_use_pem_file */
#endif /* !NO_SSL */