diff --git a/Makefile b/Makefile index 92031451..8b2249f1 100644 --- a/Makefile +++ b/Makefile @@ -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 \ diff --git a/src/httplib_ssl_use_pem_file.c b/src/httplib_ssl_use_pem_file.c new file mode 100644 index 00000000..3f932a36 --- /dev/null +++ b/src/httplib_ssl_use_pem_file.c @@ -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 */ diff --git a/src/libhttp.c b/src/libhttp.c index 6586307d..1d70af41 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -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 */