From fd6efb22e98d51b441b9b4d9e440c099ba07ca4a Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 5 Sep 2014 10:38:43 +0300 Subject: parse CRLs from PEM and DER formats --- src/openssl.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/src/openssl.c b/src/openssl.c index 757bbf0..9845bcc 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -3070,14 +3070,41 @@ int luaopen__openssl_x509_csr(lua_State *L) { * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ static int xx_new(lua_State *L) { + const char *data; + size_t len; X509_CRL **ud; + lua_settop(L, 2); + ud = prepsimple(L, X509_CRL_CLASS); - if (!(*ud = X509_CRL_new())) - return throwssl(L, "x509.crl.new"); + if ((data = luaL_optlstring(L, 1, NULL, &len))) { + int type = optencoding(L, 2, "*", X509_ANY|X509_PEM|X509_DER); + BIO *tmp; + int ok = 0; + + if (!(tmp = BIO_new_mem_buf((char *)data, len))) + return throwssl(L, "x509.crl.new"); + + if (type == X509_PEM || type == X509_ANY) { + ok = !!(*ud = PEM_read_bio_X509_CRL(tmp, NULL, 0, "")); /* no password */ + } + + if (!ok && (type == X509_DER || type == X509_ANY)) { + ok = !!(*ud = d2i_X509_CRL_bio(tmp, NULL)); + } - X509_gmtime_adj(X509_CRL_get_lastUpdate(*ud), 0); + BIO_free(tmp); + + if (!ok) + return throwssl(L, "x509.crl.new"); + } + else { + if (!(*ud = X509_CRL_new())) + return throwssl(L, "x509.crl.new"); + + X509_gmtime_adj(X509_CRL_get_lastUpdate(*ud), 0); + } return 1; } /* xx_new() */ -- cgit v1.2.3-59-g8ed1b From 3b104d32c371fab0ef77f678b2cf6640255247dc Mon Sep 17 00:00:00 2001 From: william Date: Thu, 11 Sep 2014 13:25:57 -0700 Subject: style fix --- src/openssl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/openssl.c b/src/openssl.c index 9845bcc..d18cf67 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -3098,8 +3098,7 @@ static int xx_new(lua_State *L) { if (!ok) return throwssl(L, "x509.crl.new"); - } - else { + } else { if (!(*ud = X509_CRL_new())) return throwssl(L, "x509.crl.new"); -- cgit v1.2.3-59-g8ed1b