Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

ssl allow passing cert passphrase

Browse source 
https://github.com/warmcat/libwebsockets/issues/152
This commit is contained in:
Oleh 2014-07-29 23:18:41 +08:00 • committed by Andy Green
parent c949bb3b49
commit faeac3c419
3 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
changelog
View file

@ -1,6 +1,17 @@
Changelog
---------
(post-1.3)
==========
User api additions
------------------
There's a new member in the info struct used to control context creation,
ssl_private_key_password, which allows passing into lws the passphrase on
an SSL cetificate
v1.3-chrome37-firefox30
=======================

3
lib/libwebsockets.h
View file

@ -955,7 +955,8 @@ struct lws_context_creation_info {
const char *iface;
struct libwebsocket_protocols *protocols;
struct libwebsocket_extension *extensions;
struct lws_token_limits *token_limits;
struct lws_token_limits *token_limits;
const char *ssl_private_key_password;
const char *ssl_cert_filepath;
const char *ssl_private_key_filepath;
const char *ssl_ca_filepath;

33
lib/ssl.c
View file

@ -223,6 +223,23 @@ libwebsockets_decode_ssl_error(void)
}
#ifndef LWS_NO_CLIENT
static int lws_context_init_client_ssl_pem_passwd_cb(char * buf, int size, int rwflag, void * userdata)
{
struct lws_context_creation_info * info = (struct lws_context_creation_info *)userdata;
const int passLen = (int)strlen(info->ssl_private_key_password);
const int minimumLen = passLen < size ? passLen : size;
strncpy(buf, info->ssl_private_key_password, minimumLen);
if (minimumLen < size)
{
buf[minimumLen] = '\0';
return minimumLen;
}
return minimumLen;
}
int lws_context_init_client_ssl(struct lws_context_creation_info *info,
struct libwebsocket_context *context)
{
@ -306,10 +323,22 @@ int lws_context_init_client_ssl(struct lws_context_creation_info *info,
}
}
if (info->ssl_private_key_filepath) {
/* check for provided by user password to private key */
if (info->ssl_private_key_password) {
/*
* password provided, set ssl callback and user data
* for checking password which will be trigered during
* SSL_CTX_use_PrivateKey_file function
*/
SSL_CTX_set_default_passwd_cb_userdata(
context->ssl_client_ctx,
(void *)info);
SSL_CTX_set_default_passwd_cb(context->ssl_client_ctx,
lws_context_init_client_ssl_pem_passwd_cb);
}
/* set the private key from KeyFile */
if (SSL_CTX_use_PrivateKey_file(context->ssl_client_ctx,
info->ssl_private_key_filepath,
SSL_FILETYPE_PEM) != 1) {
info->ssl_private_key_filepath, SSL_FILETYPE_PEM) != 1) {
lwsl_err("use_PrivateKey_file '%s' %lu: %s\n",
info->ssl_private_key_filepath,
ERR_get_error(),