add the ability to specify a passphase for the private key (#2)

Signed-off-by: James Moxon <[email protected]>
Signed-off-by: Joshua Houghton <[email protected]>

Author: jjhoughton

binding.gyp

@@ -2,7 +2,10 @@
   "targets": [
     {
       "target_name": "node_openssl",
-      "sources": [ "./main.c" ]
+      "sources": [ "./main.c" ],
+      "cflags": [
+        "-Wall"
+      ]
     }
   ]
 }

main.c

@@ -61,8 +61,7 @@ x509_cert_pub_key (napi_env env, napi_callback_info info)
       napi_throw_error (env, NULL, "Failed to allocate memory");
       return NULL;
     }
-  if (napi_get_value_string_utf8 (env, argv[0], buf,
-				  size, &size) != napi_ok)
+  if (napi_get_value_string_utf8 (env, argv[0], buf, size, &size) != napi_ok)
     {
       napi_throw_error (env, NULL, "Failed to parse string");
       free (buf);
@@ -77,7 +76,7 @@ x509_cert_pub_key (napi_env env, napi_callback_info info)
     }
   if ((x509 = PEM_read_bio_X509 (bio, 0, 0, 0)) == NULL)
     {
-      napi_throw_error (env, NULL, "Failed to read x509 from bio");
+      napi_throw_error (env, NULL, "Failed to read x509 from BIO");
       BIO_free (bio);
       free (buf);
       return NULL;
@@ -103,7 +102,7 @@ x509_cert_pub_key (napi_env env, napi_callback_info info)
   if (public_key->n == NULL || public_key->e == NULL)
     {
       napi_throw_error (env, NULL, "One or more required values in the "
-                        "public key is null");
+			"public key is null");
       RSA_free (public_key);
       EVP_PKEY_free (evp_pubkey);
       X509_free (x509);
@@ -146,17 +145,30 @@ x509_cert_pub_key (napi_env env, napi_callback_info info)
   return obj;
 }
 
+static int
+pass_cb (char *buf, int size, int rwflag, void *u)
+{
+  if (u == NULL)
+    return -1;
+
+  size_t len = strlen (u);
+  memcpy (buf, u, len > (size_t) size ? (size_t) size : len);
+  return len;
+}
+
 static napi_value
 rsa_priv_key (napi_env env, napi_callback_info info)
 {
-  size_t argc = 1, size;
+  size_t argc = 2, size, pass_size;
   napi_value argv[argc];
-  char *buf;
+  char *buf, *passphrase = NULL;
   napi_status status = napi_ok;
+  napi_valuetype valuetype;
 
-  RSA* private_key;
+  RSA *private_key;
   BIO *bio;
-  char *n_hex, *e_hex, *d_hex, *p_hex, *q_hex, *dmp1_hex, *dmq1_hex, *iqmp_hex;
+  char *n_hex, *e_hex, *d_hex, *p_hex, *q_hex, *dmp1_hex, *dmq1_hex,
+    *iqmp_hex;
   napi_value n_val, e_val, d_val, p_val, q_val, dmp1_val, dmq1_val, iqmp_val;
   napi_value obj;
 
@@ -180,24 +192,64 @@ rsa_priv_key (napi_env env, napi_callback_info info)
       napi_throw_error (env, NULL, "Failed to allocate memory");
       return NULL;
     }
-  if (napi_get_value_string_utf8 (env, argv[0], buf,
-				  size, &size) != napi_ok)
+  if (napi_get_value_string_utf8 (env, argv[0], buf, size, &size) != napi_ok)
     {
       napi_throw_error (env, NULL, "Failed to parse string");
       free (buf);
       return NULL;
     }
+  if (argc > 1)
+    {
+      if (napi_typeof (env, argv[1], &valuetype) != napi_ok)
+	{
+	  napi_throw_error (env, NULL, "cannot get type of second argument");
+	  free (buf);
+	  return NULL;
+	}
+    }
+  if (argc > 1 && valuetype != napi_undefined && valuetype != napi_null)
+    {
+      if (napi_get_value_string_utf8 (env, argv[1], NULL, 0, &pass_size) !=
+	  napi_ok)
+	{
+	  napi_throw_error (env, NULL, "Failed to read passphrase: "
+			    "make sure passphrase is a string");
+	  free (buf);
+	  return NULL;
+	}
+      if ((passphrase = malloc (++pass_size)) == NULL)
+	{
+	  napi_throw_error (env, NULL, "Failed to allocate memory");
+	  free (buf);
+	  return NULL;
+	}
+      if (napi_get_value_string_utf8
+	  (env, argv[1], passphrase, pass_size, &pass_size) != napi_ok)
+	{
+	  napi_throw_error (env, NULL, "Failed to read passphrase: "
+			    "make sure passphrase is a string");
+	  free (buf);
+	  if (passphrase)
+	    free (passphrase);
+	  return NULL;
+	}
+    }
   if ((bio = BIO_new_mem_buf (buf, size)) == NULL)
     {
       napi_throw_error (env, NULL, "Failed to copy key into buffer");
       free (buf);
+      if (passphrase)
+	free (passphrase);
       return NULL;
     }
-  if ((private_key = PEM_read_bio_RSAPrivateKey (bio, 0, 0, 0)) == NULL)
+  if ((private_key =
+       PEM_read_bio_RSAPrivateKey (bio, NULL, pass_cb, passphrase)) == NULL)
     {
-      napi_throw_error (env, NULL, "Failed to read key from bio");
+      napi_throw_error (env, NULL, "Failed to read private key from BIO");
       BIO_free (bio);
       free (buf);
+      if (passphrase)
+	free (passphrase);
       return NULL;
     }
 
@@ -207,10 +259,12 @@ rsa_priv_key (napi_env env, napi_callback_info info)
       private_key->dmq1 == NULL || private_key->iqmp == NULL)
     {
       napi_throw_error (env, NULL, "One or more required values in the "
-                        "private key is null");
+			"private key is null");
       RSA_free (private_key);
       BIO_free (bio);
       free (buf);
+      if (passphrase)
+	free (passphrase);
       return NULL;
     }
 
@@ -226,15 +280,20 @@ rsa_priv_key (napi_env env, napi_callback_info info)
   BIO_free (bio);
   RSA_free (private_key);
   free (buf);
+  if (passphrase)
+    free (passphrase);
 
   status |= napi_create_string_utf8 (env, n_hex, strlen (n_hex), &n_val);
   status |= napi_create_string_utf8 (env, e_hex, strlen (e_hex), &e_val);
   status |= napi_create_string_utf8 (env, d_hex, strlen (d_hex), &d_val);
   status |= napi_create_string_utf8 (env, p_hex, strlen (p_hex), &p_val);
   status |= napi_create_string_utf8 (env, q_hex, strlen (q_hex), &q_val);
-  status |= napi_create_string_utf8 (env, dmp1_hex, strlen (dmp1_hex), &dmp1_val);
-  status |= napi_create_string_utf8 (env, dmq1_hex, strlen (dmq1_hex), &dmq1_val);
-  status |= napi_create_string_utf8 (env, iqmp_hex, strlen (iqmp_hex), &iqmp_val);
+  status |=
+    napi_create_string_utf8 (env, dmp1_hex, strlen (dmp1_hex), &dmp1_val);
+  status |=
+    napi_create_string_utf8 (env, dmq1_hex, strlen (dmq1_hex), &dmq1_val);
+  status |=
+    napi_create_string_utf8 (env, iqmp_hex, strlen (iqmp_hex), &iqmp_val);
   status |= napi_create_object (env, &obj);
 
   free (n_hex);
@@ -271,24 +330,28 @@ rsa_priv_key (napi_env env, napi_callback_info info)
 }
 
 static napi_value
-init (napi_env env, napi_value exports) {
+init (napi_env env, napi_value exports)
+{
   napi_value rsa_fn, x509_fn;
 
+  OpenSSL_add_all_algorithms ();
+  OpenSSL_add_all_ciphers ();
+
   if (napi_create_function (env, NULL, 0, rsa_priv_key,
-                            NULL, &rsa_fn) != napi_ok)
+			    NULL, &rsa_fn) != napi_ok)
     napi_throw_error (env, NULL, "Unable to wrap native rsa function");
   if (napi_create_function (env, NULL, 0, x509_cert_pub_key,
-                            NULL, &x509_fn) != napi_ok)
+			    NULL, &x509_fn) != napi_ok)
     napi_throw_error (env, NULL, "Unable to wrap native x509 function");
 
   if (napi_set_named_property (env, exports, "RSAPrivateKey",
-                               rsa_fn) != napi_ok)
+			       rsa_fn) != napi_ok)
     napi_throw_error (env, NULL, "Unable to populate exports with rsa");
   if (napi_set_named_property (env, exports, "X509PublicKey",
-                               x509_fn) != napi_ok)
+			       x509_fn) != napi_ok)
     napi_throw_error (env, NULL, "Unable to populate exports with x509");
 
   return exports;
 }
 
-NAPI_MODULE(NODE_GYP_MODULE_NAME, init)
+NAPI_MODULE (NODE_GYP_MODULE_NAME, init)

main.js

@@ -1 +1 @@
-module.exports = require("./build/Release/node_openssl");
+module.exports = require('bindings')('node_openssl');

package.json

@@ -5,11 +5,17 @@
   "private": true,
   "gypfile": true,
   "scripts": {
-    "start": "node-gyp configure build && node module.js",
-    "test": "node test.js"
+    "configure": "node-gyp configure",
+    "build": "node-gyp --debug rebuild",
+    "indent": "indent *.c *.h",
+    "test": "cd test && node test.js"
+  },
+  "dependencies": {
+    "bindings": "^1.2.1",
+    "node-gyp": ""
   },
   "engines": {
-    "node" : ">=8.4.0"
+    "node": ">=8.4.0"
   },
   "author": "Joshua Houghton <[email protected]",
   "license": "LGPL"

test.js

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC0TCCAbkCAQEwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCR0IxEzARBgNV
+BAgMCkNoZWx0ZW5oYW0xDzANBgNVBAoMBlJpcGphcjESMBAGA1UEAwwJUmlwamFy
+IENBMB4XDTE5MDQxNTEyNDgzMFoXDTQ2MDgzMTEyNDgzMFowFjEUMBIGA1UEAwwL
+SmFtZXMgTW94b24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNpKKs
+xlWUokSUY1XBRRHlkkz5BKnr8xtb3FPJeOElouDKZTNjF/15V4z3sz/rm3iTioJw
+5PJu3y/Yzg5X1eg4SL90QkuKlqwPHLuoGhh+38JCmsPlwlBf3bQp0TET0RogTHPJ
+i9W+66FwkOSd1PmzX5jAcFn4WtyBIISFPoRsRBeGvHEuPDsSai3fBES2kqWt/SMm
+Qeqv3B0vt14wSlCvllqtKhWQ2enghGaWDgmM9tW/HOUCH+Ajeag9W92gMrF61qxC
+rsJK5PK98jFEoE+IUcnG3e3NiOrwhXf+FYc+eejB//e1BUgcOBMvrKzEM6K1HP2P
+woPHPRfp6Ayaeq+vAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAFNGe7so0G+nZcl0
+Lr/76IWO+3U0aZVeY2lOqyhICWxqexspSvfCJB5Zs3fh/HAMGhGCz0HueLY7/zoJ
+E+sOtOx1zmqNxKGR9U8jEv578ou24atyRWmXcTY67Sld+zGES3tnJeF7VZZ0wTed
+1y3i/KxxWxxob2W7ub0K6ULu6st3upVZ0K3T20gaqJ1gfnJEKUsOFocDX4WjTo13
++NlMQw7Fhzt4rqzrRaam2y/hye/Vnvu81K+rbi8vC8bmH1lFttlXfic+0bYiLNzc
+sBbSr3qHmq2mLUtiBnAgBniIaVjBu0yssdkod3BLUwka2inUtVsynrB/rF3XUbbt
+ZsP1whw=
+-----END CERTIFICATE-----

test/1cert

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDNpKKsxlWUokSU
+Y1XBRRHlkkz5BKnr8xtb3FPJeOElouDKZTNjF/15V4z3sz/rm3iTioJw5PJu3y/Y
+zg5X1eg4SL90QkuKlqwPHLuoGhh+38JCmsPlwlBf3bQp0TET0RogTHPJi9W+66Fw
+kOSd1PmzX5jAcFn4WtyBIISFPoRsRBeGvHEuPDsSai3fBES2kqWt/SMmQeqv3B0v
+t14wSlCvllqtKhWQ2enghGaWDgmM9tW/HOUCH+Ajeag9W92gMrF61qxCrsJK5PK9
+8jFEoE+IUcnG3e3NiOrwhXf+FYc+eejB//e1BUgcOBMvrKzEM6K1HP2PwoPHPRfp
+6Ayaeq+vAgMBAAECggEAOtzAL6JJxtS3up3AYyTpHYRGAhViqgYZM68aUJYIJCS+
+IVDcZ6XrSPtVf2VQi5kh52GDOttdxXyfDnjUxDGXWd0A6D89rjq4n07DLDfkART9
+XuE75506MmacdkfJu3lj+BDKJ8ud8Bs0R6tBtSfMHZrkd1jxd9RSP6fWJumhL/e+
+QM92ZNgbc8Uqk/tvxmrLcjrMgb46kvb5SC/FwGsOII+06fEpRde6O7IzknDIYu1w
+iKGi2gEZ38DA/Pp24AqrErYQ8TQ1V9sz0ddJCUez5YH8WnE6hjmpcxnqn6McTbP1
+n8QK2/98Yq/hbdJ3oz2zfCjrwGvj4V052i/rgUIHsQKBgQDpivZL8yl5qXM49oOe
+mSJ0XnZ3PmgFTQ45/6WeD1Epf0LyG49/Q5FF4cERUS7HU3QWZVYDE1OpmkIxKh7t
+nCoDJqkPWPEhGZskCD/fBgP1+miUtrdMr4klDWhLX98+Wta9ULWvu9rHuijRkFoW
+KYe/Ai09L3kSWDvyXD6pJZmx5wKBgQDhauBYLwQtPCPkCexdwwHDxIDAnTT06dFr
+KYEmaKmVu6Jqt1KR8tG4tIhAo9XRRjDjRJ8+5kvhXlD1+vDKXvt4JVqqa3ANyvGS
+YHGVJaQEU8p6A7J0avNmWWm1jlEybdyvuXx3Kc/lMIEmmxRyvpJOM0rpxpoJcRBO
+KRoFBLVq+QKBgCGC6yyiy8TFZ984oFJVrvf7xgv+THbWQ8BWyrEPiZnmxPhws/qS
++3mHl2iguZGoi/PavqjaURr5I55iaOW3jt+84G1vWcpiHjzhYijieBcHw5HzVgIO
+/iLu9ZQ7QZF0/3NS7X81+YLHV6wahpK/itcBvPQWp8zWFGQGkIc8+fzpAoGBAMrz
+S8t5gTws4m+E06/TS/pzKCzDHZPIFIl0E9h98PljtyZ3qTrIMTQoLmhsWa0Skh98
+gBfEhtsA7MmaxkKd47DXiNrY4kk4x+ivNnQ/MH3I5wqV24zfYgdrRzZ0TPynV0NL
+MBmlpozF7/HPPEjW9ai8m50A91y61CBa9xc/lwsZAoGAVRIBD/OsDKoH/fMicg/L
++dDeO1hjTRLOY/03w70SRnZsUhfZlSS9CmLC27+4OqVniI446UmzP8veOSqbVoUV
+Btg7HmFMSSmoQde79G4F0lmkBBimwcbEKbzZln9QSyI9vM4221+V7MM1VNcXJPuG
+nrcTOpBvGFCDEZP80lItePs=
+-----END PRIVATE KEY-----

test/1key

@@ -0,0 +1 @@
+CDA4A2ACC65594A244946355C14511E5924CF904A9EBF31B5BDC53C978E125A2E0CA65336317FD79578CF7B33FEB9B78938A8270E4F26EDF2FD8CE0E57D5E83848BF74424B8A96AC0F1CBBA81A187EDFC2429AC3E5C2505FDDB429D13113D11A204C73C98BD5BEEBA17090E49DD4F9B35F98C07059F85ADC812084853E846C441786BC712E3C3B126A2DDF0444B692A5ADFD232641EAAFDC1D2FB75E304A50AF965AAD2A1590D9E9E08466960E098CF6D5BF1CE5021FE02379A83D5BDDA032B17AD6AC42AEC24AE4F2BDF23144A04F8851C9C6DDEDCD88EAF08577FE15873E79E8C1FFF7B505481C38132FACACC433A2B51CFD8FC283C73D17E9E80C9A7AAFAF

test/1mod

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAyDnDB9i0Q3HldUz/S2k47pxqH83mOTZc1aevxhEDzAI4v5Um
+kPNASimKlkCSsPSFW6/gkxCVJIfYM+XC4/XF3dsR8Mu0jXiqjTrQJNAeaOFR9Pss
+/2nVFLcJEtepIJ7jwSED2Jtsooyzmm0mteXeOID3JmzVjo1bcU71bKLjqFt7/mkV
+aIjxVTiZB0u6GBYba86572YixiJUDfHaBvZfrlfIOT7IgczwsgazdPnzyiOHXEbw
+8DcT950E/eOE1yD9daYWFlkc094R8JllOHzyUoZ8QpL+1rFV9Dwjm+QlV9nxcQqp
+5nsyBKarbrQDnafUQwEImBtGNOomAk6Cf/PGsQIDAQABAoIBAQCwrGcvMUQ+ju2N
+h5dtDzexNEtgLOqMaS+ZRxGOj8zt4rf4NL+G/10nE2i6E9hcVCaoNJTQr70qMsPP
+Z1mElIU3seous1Bp1KOJYu/uy8VJfig3JrsZ1GS0lp1nBuyxYAJPk7Y1F0/QTp7c
+EJwrvN1Mtl9ehIIb+xdI8AcXCNQg5Kjkyb1BOgd1T3+nUi9hchAqCL2B9ppXoeXz
+19WcAJJsgCFutLF+AetSR8H8KJMyMa/pp7fH7ydAcA9CmBaLE0uaxWWCHHjKt3oA
+EJ4cdvUxHUkvJGpUMtOm1/zSNz/pc1tUkFhYInqlg3DPB4pwQnPaH5sf2Fg4mUwW
+YH+ILCERAoGBAOgXhKIPJ9GZ2DMALgE3MZXGHY+iS/XtMfU7IfGvbOlbYIRljoPv
+oAhI6cNPD9zpmptqIv7BhFdVmDb6hNRORgGC8iawI+8aL3Ks4hg/smiIMwnFA/ag
+Vy/vcKtueWwOqLlqYl8bB0x1GTh+pufO0lv5hVN9N9c09/P+rOmQ2M6/AoGBANzZ
+5qeuD4qnY6KBOFw7x6I6HSYTJP5ELPWGoDJX1A3O/zUHR4Ig7/hGmtaqyBNk5Vix
+EPmIW17obXVf3ClE8DQts1Br/UfCW5Hlsb+f0rG0ANkxcaqNvAUBE+m+p66R1Rma
+xBJOGvBPMY2zZp1OHN3kJQFNusI9S+ZDHFavxDaPAoGADnWgosQU8/8EtDC3rQW2
+RiGAp/kxiFHNwfx8IeWPAH7b5YO6PEgKjVmVjsB3OYkoQ7R6F6sQxqwjfpFfAycZ
+P3DcC0MACh50hE13DJGzWMXbgClRFOVqaSceut94Gx5SrrKNDGXPr5jACIADf/+n
+pWlHQCtV9kdrhzz/otGOYFsCgYEAq0+LD36BJ7h4HNHHeiQU0s3pVmN7SpBvn3Ry
+RxrBroRmiie/XD1YZ2m9Kc8Hq6OUE5wl4qnW1mPMpENbb9e9y3u3oCZkLYmhpiZa
+Hp5GvPk3v0IPPZD7y5XucF4ni84rUtUuSlSzqLyFX7lNW6//zE7wNXap64nImjBs
+hwGIXhkCgYA2ChGJCBQrsy1iRzKwRMNwkGPFDxJh+S9yr0G3uqXbKEZg4IAwSFYy
+rkAVQzV9EYl4ZuLJjlACSMsGEwzF0dXzVpnIKt9dl/3LdJy8ZV7spwI6/ctnJtbz
+V17zJpfiSVOl1JTLNG/r3OBQsvYn4Ly8mNMWBXeGxBah8D9vfKFxnw==
+-----END RSA PRIVATE KEY-----

test/2key

@@ -0,0 +1 @@
+C839C307D8B44371E5754CFF4B6938EE9C6A1FCDE639365CD5A7AFC61103CC0238BF952690F3404A298A964092B0F4855BAFE09310952487D833E5C2E3F5C5DDDB11F0CBB48D78AA8D3AD024D01E68E151F4FB2CFF69D514B70912D7A9209EE3C12103D89B6CA28CB39A6D26B5E5DE3880F7266CD58E8D5B714EF56CA2E3A85B7BFE69156888F1553899074BBA18161B6BCEB9EF6622C622540DF1DA06F65FAE57C8393EC881CCF0B206B374F9F3CA23875C46F0F03713F79D04FDE384D720FD75A61616591CD3DE11F09965387CF252867C4292FED6B155F43C239BE42557D9F1710AA9E67B3204A6AB6EB4039DA7D4430108981B4634EA26024E827FF3C6B1