Skip to content

Add support for private keys in crypto devices #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for private keys in crypto devices #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions inc/azure_uhttp_c/uhttp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ extern "C" {
#endif /* __cplusplus */

#include "azure_c_shared_utility/httpheaders.h"
#include "azure_c_shared_utility/tlsio_cryptodev.h"
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/xio.h"
#include "umock_c/umock_c_prod.h"
Expand Down Expand Up @@ -73,6 +74,7 @@ MOCKABLE_FUNCTION(, void, uhttp_client_dowork, HTTP_CLIENT_HANDLE, handle);

MOCKABLE_FUNCTION(, HTTP_CLIENT_RESULT, uhttp_client_set_trace, HTTP_CLIENT_HANDLE, handle, bool, trace_on, bool, trace_data);
MOCKABLE_FUNCTION(, HTTP_CLIENT_RESULT, uhttp_client_set_X509_cert, HTTP_CLIENT_HANDLE, handle, bool, ecc_type, const char*, certificate, const char*, private_key);
MOCKABLE_FUNCTION(, HTTP_CLIENT_RESULT, uhttp_client_set_X509_cert_cryptodev, HTTP_CLIENT_HANDLE, handle, bool, ecc_type, const char*, certificate, TLSIO_CRYPTODEV_PKEY*, private_key_cryptodev);
MOCKABLE_FUNCTION(, HTTP_CLIENT_RESULT, uhttp_client_set_trusted_cert, HTTP_CLIENT_HANDLE, handle, const char*, certificate);
MOCKABLE_FUNCTION(, const char*, uhttp_client_get_trusted_cert, HTTP_CLIENT_HANDLE, handle);
MOCKABLE_FUNCTION(, HTTP_CLIENT_RESULT, uhttp_client_set_option, HTTP_CLIENT_HANDLE, handle, const char*, optionName, const void*, value);
Expand Down
78 changes: 65 additions & 13 deletions src/uhttp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ typedef struct HTTP_CLIENT_HANDLE_DATA_TAG
bool cert_type_ecc;
char* x509_cert;
char* x509_pk;
TLSIO_CRYPTODEV_PKEY* x509_cryptodev_pk;
char* certificate;
int connected;
} HTTP_CLIENT_HANDLE_DATA;
Expand Down Expand Up @@ -991,6 +992,7 @@ void uhttp_client_destroy(HTTP_CLIENT_HANDLE handle)
xio_destroy(handle->xio_handle);
free(handle->certificate);
free(handle->x509_pk);
free(handle->x509_cryptodev_pk);
free(handle->x509_cert);
free(handle);
}
Expand Down Expand Up @@ -1028,9 +1030,15 @@ HTTP_CLIENT_RESULT uhttp_client_open(HTTP_CLIENT_HANDLE handle, const char* host
http_data->connect_user_ctx = callback_ctx;
http_data->port_num = port_num;

if (http_data->x509_cert != NULL && http_data->x509_pk != NULL)
if (http_data->x509_cert != NULL && (http_data->x509_pk != NULL || http_data->x509_cryptodev_pk != NULL))
{
if (xio_setoption(http_data->xio_handle, SU_OPTION_X509_CERT, http_data->x509_cert) != 0 || xio_setoption(http_data->xio_handle, SU_OPTION_X509_PRIVATE_KEY, http_data->x509_pk) != 0)
int rc = xio_setoption(http_data->xio_handle, SU_OPTION_X509_CERT, http_data->x509_cert);
if (http_data->x509_cryptodev_pk != NULL) {
rc |= xio_setoption(http_data->xio_handle, SU_OPTION_X509_CRYPTODEV_PRIVATE_KEY, http_data->x509_cryptodev_pk);
} else {
rc |= xio_setoption(http_data->xio_handle, SU_OPTION_X509_PRIVATE_KEY, http_data->x509_pk);
}
if (rc != 0)
{
LogError("Failed setting x509 certificate");
result = HTTP_CLIENT_ERROR;
Expand Down Expand Up @@ -1356,16 +1364,10 @@ HTTP_CLIENT_RESULT uhttp_client_set_trace(HTTP_CLIENT_HANDLE handle, bool trace_
return result;
}

HTTP_CLIENT_RESULT uhttp_client_set_X509_cert(HTTP_CLIENT_HANDLE handle, bool ecc_type, const char* certificate, const char* private_key)
{
HTTP_CLIENT_RESULT result;
if (handle == NULL || certificate == NULL || private_key == NULL)
{
/* Codes_SRS_UHTTP_07_038: [If handle is NULL then http_client_set_trace shall return HTTP_CLIENT_INVALID_ARG] */
result = HTTP_CLIENT_INVALID_ARG;
LogError("invalid parameter handle: %p certificate: %p private_key: %p", handle, certificate, private_key);
}
else if (handle->recv_msg.recv_state != state_initial)
static HTTP_CLIENT_RESULT uhttp_client_set_just_X509_cert(HTTP_CLIENT_HANDLE handle, bool ecc_type, const char* certificate) {
HTTP_CLIENT_RESULT result = HTTP_CLIENT_OK;

if (handle->recv_msg.recv_state != state_initial)
{
result = HTTP_CLIENT_INVALID_STATE;
LogError("You must set the X509 certificates before opening the connection");
Expand All @@ -1378,7 +1380,57 @@ HTTP_CLIENT_RESULT uhttp_client_set_X509_cert(HTTP_CLIENT_HANDLE handle, bool ec
result = HTTP_CLIENT_ERROR;
LogError("failure allocating certificate");
}
else if (mallocAndStrcpy_s(&handle->x509_pk, private_key) != 0)
}

return result;
}

HTTP_CLIENT_RESULT uhttp_client_set_X509_cert_cryptodev(HTTP_CLIENT_HANDLE handle, bool ecc_type, const char* certificate, TLSIO_CRYPTODEV_PKEY* private_key)
{
HTTP_CLIENT_RESULT result;

if (handle == NULL || certificate == NULL || private_key == NULL)
{
/* Codes_SRS_UHTTP_07_038: [If handle is NULL then http_client_set_trace shall return HTTP_CLIENT_INVALID_ARG] */
result = HTTP_CLIENT_INVALID_ARG;
LogError("invalid parameter handle: %p certificate: %p private_key: %p", handle, certificate, private_key);
}

result = uhttp_client_set_just_X509_cert(handle, ecc_type, certificate);

if (result == HTTP_CLIENT_OK) {
handle->x509_cryptodev_pk = malloc(sizeof(TLSIO_CRYPTODEV_PKEY));
if (handle->x509_cryptodev_pk == NULL) {
free(handle->x509_cert);
handle->x509_cert = NULL;

result = HTTP_CLIENT_ERROR;
LogError("failure allocating private key");
}
else
{
memcpy(handle->x509_cryptodev_pk, private_key, sizeof(TLSIO_CRYPTODEV_PKEY));
result = HTTP_CLIENT_OK;
}
}
return result;
}

HTTP_CLIENT_RESULT uhttp_client_set_X509_cert(HTTP_CLIENT_HANDLE handle, bool ecc_type, const char* certificate, const char* private_key)
{
HTTP_CLIENT_RESULT result;

if (handle == NULL || certificate == NULL || private_key == NULL)
{
/* Codes_SRS_UHTTP_07_038: [If handle is NULL then http_client_set_trace shall return HTTP_CLIENT_INVALID_ARG] */
result = HTTP_CLIENT_INVALID_ARG;
LogError("invalid parameter handle: %p certificate: %p private_key: %p", handle, certificate, private_key);
}

result = uhttp_client_set_just_X509_cert(handle, ecc_type, certificate);

if (result == HTTP_CLIENT_OK) {
if (mallocAndStrcpy_s(&handle->x509_pk, private_key) != 0)
{
free(handle->x509_cert);
handle->x509_cert = NULL;
Expand Down