From 0d2004141917f65c3a4c7b0bc0e8005d3a47b8c8 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 6 Jun 2009 13:03:31 +0000 Subject: [PATCH] nixio: Add support for DER keyfiles --- libs/nixio/src/axtls-compat.h | 1 + libs/nixio/src/tls-context.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libs/nixio/src/axtls-compat.h b/libs/nixio/src/axtls-compat.h index 77533ef4ff..aee24f56c8 100644 --- a/libs/nixio/src/axtls-compat.h +++ b/libs/nixio/src/axtls-compat.h @@ -44,6 +44,7 @@ #define SSL_OP_NO_SSLv3 0x02000000L #define SSL_OP_NO_SSLv2 0x01000000L #define SSL_FILETYPE_PEM 1 +#define SSL_FILETYPE_ASN1 2 #define SSL_VERIFY_NONE 0x00 #define SSL_VERIFY_PEER 0x01 #define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02 diff --git a/libs/nixio/src/tls-context.c b/libs/nixio/src/tls-context.c index fdbe224622..e55de05cc7 100644 --- a/libs/nixio/src/tls-context.c +++ b/libs/nixio/src/tls-context.c @@ -119,7 +119,17 @@ static int nixio_tls_ctx_set_cert(lua_State *L) { static int nixio_tls_ctx_set_key(lua_State *L) { SSL_CTX *ctx = nixio__checktlsctx(L); const char *cert = luaL_checkstring(L, 2); - const int ktype = SSL_FILETYPE_PEM; + const char *type = luaL_optstring(L, 3, "pem"); + int ktype; + + if (!strcmp(type, "pem")) { + ktype = SSL_FILETYPE_PEM; + } else if (!strcmp(type, "asn1")) { + ktype = SSL_FILETYPE_ASN1; + } else { + return luaL_argerror(L, 3, "supported values: pem, asn1"); + } + return nixio__tls_pstatus(L, SSL_CTX_use_PrivateKey_file(ctx, cert, ktype)); } -- 2.30.2