aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatarLibravatar William Ahern <william@25thandclement.com> 2016-06-24 19:10:40 -0700
committerLibravatarLibravatar William Ahern <william@25thandclement.com> 2016-06-24 19:10:40 -0700
commitbddd9f5a79ae4aea43d7dca09157c53e40503bfb (patch)
tree5458f64fbd3a52e7128f8977715b3ee1cac3098a /src
parenta63e737bd12e466937223c848387d0b704f02e31 (diff)
downloadluaossl-bddd9f5a79ae4aea43d7dca09157c53e40503bfb.tar.gz
luaossl-bddd9f5a79ae4aea43d7dca09157c53e40503bfb.tar.bz2
luaossl-bddd9f5a79ae4aea43d7dca09157c53e40503bfb.zip
refactor style to more closely match the style of the existing code, such as it is
Diffstat (limited to 'src')
-rw-r--r--src/openssl.c57
1 files changed, 35 insertions, 22 deletions
diff --git a/src/openssl.c b/src/openssl.c
index 6b74025..9c40e57 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -5490,33 +5490,40 @@ static int xr_setPublicKey(lua_State *L) {
static int xr_setExtensionByNid(lua_State *L, X509_REQ *csr, int target_nid, void* value) {
STACK_OF(X509_EXTENSION) *sk = NULL;
- X509_ATTRIBUTE *attr;
- int has_attrs=0, idx, *pnid;
-
- // Replace existing if it's there. Extensions are stored in a CSR in an interesting way:
- //
- // They are stored as a list under either (most likely) the "official"
- // NID_ext_req or under NID_ms_ext_req which means everything is stored
- // under a list in a single "attribute" so we can't use X509_REQ_add1_attr
- // or similar.
- //
- // Instead we have to get the extensions, find and replace the SAN if it's
- // in there, then *replace* the extensions in the list of attributes. (If
- // we just try to add it the old ones are found first and don't take
- // priority)
+ int has_attrs=0;
+ /*
+ * Replace existing if it's there. Extensions are stored in a CSR in
+ * an interesting way:
+ *
+ * They are stored as a list under either (most likely) the
+ * "official" NID_ext_req or under NID_ms_ext_req which means
+ * everything is stored under a list in a single "attribute" so we
+ * can't use X509_REQ_add1_attr or similar.
+ *
+ * Instead we have to get the extensions, find and replace the SAN
+ * if it's in there, then *replace* the extensions in the list of
+ * attributes. (If we just try to add it the old ones are found
+ * first and don't take priority.)
+ */
has_attrs = X509_REQ_get_attr_count(csr);
- sk = X509_REQ_get_extensions(csr);
+ sk = X509_REQ_get_extensions(csr);
if (!X509V3_add1_i2d(&sk, target_nid, value, 0, X509V3_ADD_REPLACE))
goto error;
-
if (X509_REQ_add_extensions(csr, sk) == 0)
goto error;
+ sk_X509_EXTENSION_pop_free(sk, X509_EXTENSION_free);
+ sk = NULL;
- // Delete the old extensions attribute, so that the one we just added takes priority
+ /*
+ * Delete the old extensions attribute, so that the one we just
+ * added takes priority.
+ */
if (has_attrs) {
- attr = NULL;
+ X509_ATTRIBUTE *attr = NULL;
+ int idx, *pnid;
+
for (pnid = X509_REQ_get_extension_nids(); *pnid != NID_undef; pnid++) {
idx = X509_REQ_get_attr_by_NID(csr, *pnid, -1);
if (idx == -1)
@@ -5530,16 +5537,19 @@ static int xr_setExtensionByNid(lua_State *L, X509_REQ *csr, int target_nid, voi
goto error;
}
- // We have to mark the encoded form as invalid, otherwise when we write it
- // out again it will use the loaded version
+ /*
+ * We have to mark the encoded form as invalid, otherwise when we
+ * write it out again it will use the loaded version.
+ */
csr->req_info->enc.modified = 1;
- sk_X509_EXTENSION_pop_free(sk, X509_EXTENSION_free);
lua_pushboolean(L, 1);
+
return 1;
error:
if (sk)
sk_X509_EXTENSION_pop_free(sk, X509_EXTENSION_free);
+
return auxL_error(L, auxL_EOPENSSL, "x509.csr.setExtensionByNid");
} /* xr_setExtensionByNid() */
@@ -5547,20 +5557,23 @@ error:
static int xr_setSubjectAlt(lua_State *L) {
X509_REQ *csr = checksimple(L, 1, X509_CSR_CLASS);
GENERAL_NAMES *gens = checksimple(L, 2, X509_GENS_CLASS);
+
return xr_setExtensionByNid(L, csr, NID_subject_alt_name, gens);
} /* xr_setSubjectAlt */
static int xr_getSubjectAlt(lua_State *L) {
X509_REQ *csr = checksimple(L, 1, X509_CSR_CLASS);
+ STACK_OF(X509_EXTENSION) *exts;
GENERAL_NAMES *gens;
- STACK_OF(X509_EXTENSION) *exts = X509_REQ_get_extensions(csr);
+ exts = X509_REQ_get_extensions(csr);
gens = X509V3_get_d2i(exts, NID_subject_alt_name, NULL, NULL);
sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
if (!gens) goto error;
gn_dup(L, gens);
+
return 1;
error:
return 0;