X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Fnixio%2Fsrc%2Ftls-context.c;h=e9a833f59065de0c3f3babf66fbebfddc764eb3e;hb=80b5a4b6f88b8ecbcb27bfd062b37e249e78ced9;hp=fdbe2246223216beaf84603e235072aa7d385b4b;hpb=20d2e99010f067cd45a7bcfa93fe10862882b3a8;p=project%2Fluci.git

diff --git a/libs/nixio/src/tls-context.c b/libs/nixio/src/tls-context.c
index fdbe22462..e9a833f59 100644
--- a/libs/nixio/src/tls-context.c
+++ b/libs/nixio/src/tls-context.c
@@ -113,13 +113,46 @@ static int nixio_tls_ctx_create(lua_State *L) {
 static int nixio_tls_ctx_set_cert(lua_State *L) {
 	SSL_CTX *ctx = nixio__checktlsctx(L);
 	const char *cert = luaL_checkstring(L, 2);
-	return nixio__tls_pstatus(L, SSL_CTX_use_certificate_chain_file(ctx, cert));
+	const char *type = luaL_optstring(L, 3, "chain");
+	int ktype;
+
+	if (!strcmp(type, "chain")) {
+		return nixio__tls_pstatus(L,
+				SSL_CTX_use_certificate_chain_file(ctx, cert));
+	} else 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: chain, pem, asn1");
+	}
+
+	return nixio__tls_pstatus(L,
+			SSL_CTX_use_certificate_file(ctx, cert, ktype));
+}
+
+static int nixio_tls_ctx_set_verify_locations(lua_State *L) {
+	SSL_CTX *ctx = nixio__checktlsctx(L);
+	const char *CAfile = luaL_optstring(L, 2, NULL);
+	const char *CApath = luaL_optstring(L, 3, NULL);
+	return nixio__tls_pstatus(L, SSL_CTX_load_verify_locations(ctx, 
+					CAfile, CApath));
 }
 
 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));
 }
 
@@ -178,6 +211,7 @@ static const luaL_reg R[] = {
 /* ctx function table */
 static const luaL_reg CTX_M[] = {
 	{"set_cert",			nixio_tls_ctx_set_cert},
+	{"set_verify_locations",       nixio_tls_ctx_set_verify_locations},
 	{"set_key",				nixio_tls_ctx_set_key},
 	{"set_ciphers",			nixio_tls_ctx_set_ciphers},
 	{"set_verify",			nixio_tls_ctx_set_verify},