nixio: Add support for DER keyfiles

diff --git a/libs/nixio/src/axtls-compat.h b/libs/nixio/src/axtls-compat.h
index 77533ef4ffd1ec21c12d53cd3d6e0c5a9564e092..aee24f56c87e5f04520e4a5fec946787d5794991 100644 (file)
--- 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 fdbe2246223216beaf84603e235072aa7d385b4b..e55de05cc7c2b638947798969840997770eca393 100644 (file)
--- 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));
 }