node-webcrypto-ossl - npm Package Compare versions

Comparing version 1.0.20 to 1.0.21

index.d.ts

@@ -0,0 +0,0 @@ /// <reference types="node" />

lib/crypto/aes.ts

@@ -0,0 +0,0 @@ // Core

lib/crypto/ec.ts

@@ -0,0 +0,0 @@ // Core

lib/crypto/hmac.ts

@@ -0,0 +0,0 @@ // Core

lib/crypto/pbkdf2.ts

@@ -0,0 +0,0 @@ // Core

lib/crypto/rsa.ts

@@ -48,5 +48,6 @@ // Core
     public static importKey(format: string, keyData: JsonWebKey | BufferSource, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey> {
+        let keyType = native.KeyType.PUBLIC;
+        const alg: any = algorithm;
         return new Promise((resolve, reject) => {
             const formatLC = format.toLocaleLowerCase();
-            const alg = algorithm as Algorithm;
             switch (formatLC) {
@@ -60,3 +61,2 @@ case "jwk":
                     data["e"] = b64_decode(jwk.e!);
-                    let keyType = native.KeyType.PUBLIC;
                     if (jwk.d) {
@@ -76,4 +76,3 @@ keyType = native.KeyType.PRIVATE;
                             } else {
-                                const rsa = new CryptoKey(key, alg, keyType ? "private" : "public", extractable, keyUsages);
-                                resolve(rsa);
+                                resolve(key);
                             }
@@ -90,5 +89,6 @@ } catch (e) {
                     }
-                    let importFunction = native.Key.importPkcs8;
-                    if (formatLC === "spki") {
-                        importFunction = native.Key.importSpki;
+                    let importFunction = native.Key.importSpki;
+                    if (formatLC === "pkcs8") {
+                        keyType = native.KeyType.PRIVATE;
+                        importFunction = native.Key.importPkcs8;
                     }
@@ -100,4 +100,3 @@ importFunction(<Buffer> keyData, (err, key) => {
                             } else {
-                                const rsa = new CryptoKey(key, alg, format.toLocaleLowerCase() === "spki" ? "public" : "private", extractable, keyUsages);
-                                resolve(rsa);
+                                resolve(key);
                             }
@@ -112,2 +111,7 @@ } catch (e) {
             }
+        })
+        .then((key: native.Key) => {
+            alg.modulusLength = key.modulusLength() << 3;
+            alg.publicExponent = new Uint8Array(key.publicExponent());
+            return new CryptoKey(key, alg, keyType ? "private" : "public", extractable, keyUsages);
         });
@@ -114,0 +118,0 @@ }

lib/key_storage.ts

@@ -0,0 +0,0 @@ // Core

lib/types.d.ts

 type NodeBufferSource = BufferSource | Buffer;

package.json

 {
   "name": "node-webcrypto-ossl",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "repository": {
@@ -5,0 +5,0 @@ "type": "git",

test/crypto.js

@@ -0,0 +0,0 @@ "use strict";

test/digest.js

@@ -0,0 +0,0 @@ "use strict";

test/helper.js

@@ -0,0 +0,0 @@ "use strict"

test/hmac.js

@@ -0,0 +0,0 @@ "use strict";

test/key_storage.js

@@ -0,0 +0,0 @@ "use strict";

test/native_hmac.js

@@ -0,0 +0,0 @@ "use strict";

test/native/pbkdf2.js

@@ -0,0 +0,0 @@ "use strict";

test/pbkdf2.js

@@ -0,0 +0,0 @@ "use strict";

test/rsa.js

@@ -215,3 +215,28 @@ "use strict";
 
+    context("Algorithm parameters", () => {
 
-})
+        it("modulusLength/publicExponent for imported key", (done) => {
+            webcrypto.subtle.generateKey({ name: "RSASSA-PKCS1-v1_5", hash: "SHA-1", publicExponent: new Uint8Array([1, 0, 1]), modulusLength: 2048 }, true, ["sign", "verify"])
+                .then((keyPair) => {
+                    const key = keyPair.privateKey;
+                    assert.equal(ArrayBuffer.isView(key.algorithm.publicExponent), true);
+                    assert.equal(key.algorithm.publicExponent.length === 3, true);
+                    assert.equal(key.algorithm.modulusLength === 2048, true);
+                    assert.equal(key.type === "private", true);
+                    return webcrypto.subtle.exportKey("pkcs8", key);
+                })
+                .then((raw) => {
+                    return webcrypto.subtle.importKey("pkcs8", raw, { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" }, false, ["sign"]);
+                })
+                .then((key) => {
+                    assert.equal(ArrayBuffer.isView(key.algorithm.publicExponent), true);
+                    assert.equal(key.algorithm.publicExponent.length === 3, true);
+                    assert.equal(key.algorithm.modulusLength === 2048, true);
+                    assert.equal(key.type === "private", true);
+                })
+                .then(done, done);
+        });
+
+    });
+
+});

test/vectors/aes_kw.js

@@ -0,0 +0,0 @@ "use strict";

test/vectors/hmac.js

@@ -0,0 +0,0 @@ "use strict";

test/vectors/pbkdf2.js

@@ -0,0 +0,0 @@ "use strict";

test/vectors/rsa_pss.js

@@ -0,0 +0,0 @@ "use strict";

tslint.json

@@ -0,0 +0,0 @@ {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

4036

increased by0.67%

Worsened metrics

Total package byte prevSize

352685

decreased by-0.5%

No dependency changes