Merge pull request #22 from crypto-browserify/upgrade-bn

upgrade bn and add 2 curves
browserify · Nov 2, 2015 · 75faadd · 75faadd
2 parents 153a93f + bd8dc2e
commit 75faadd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/algos.js b/algos.js
@@ -29,6 +29,7 @@ exports['ecdsa-with-SHA1'] = {
   hash: 'sha1',
   id: new Buffer('', 'hex')
 }
+
 exports.DSA = exports['DSA-SHA1'] = exports['DSA-SHA'] = {
   sign: 'dsa',
   hash: 'sha1',

diff --git a/curves.js b/curves.js
@@ -6,3 +6,7 @@ exports['1.3.132.0.33'] = 'p224'
 exports['1.2.840.10045.3.1.1'] = 'p192'
 
 exports['1.2.840.10045.3.1.7'] = 'p256'
+
+exports['1.3.132.0.34'] = 'p384'
+
+exports['1.3.132.0.35'] = 'p521'
diff --git a/package.json b/package.json
@@ -16,13 +16,13 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "bn.js": "^2.0.0",
-    "browserify-rsa": "^2.0.0",
+    "bn.js": "^4.1.1",
+    "browserify-rsa": "^4.0.0",
     "create-hash": "^1.1.0",
     "create-hmac": "^1.1.2",
-    "elliptic": "^3.0.0",
+    "elliptic": "^6.0.0",
     "inherits": "^2.0.1",
-    "parse-asn1": "^3.0.0"
+    "parse-asn1": "^5.0.0"
   },
   "devDependencies": {
     "tap-spec": "^1.0.1",

diff --git a/test/fixtures.json b/test/fixtures.json
@@ -66,6 +66,20 @@
         "message": "dsa with 1024 keys and a password variant",
         "scheme": "DSA-SHA",
         "signature": "302c02147e0eb669879a758df5b3efae631fe51052852434021472e7d838db4356f9d5d305c78dbda65711259bfa"
+      },
+      {
+        "public": "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUhZd0VBWUhLb1pJemowQ0FRWUZLNEVFQUNJRFlnQUVXVUIzL0RwOVZSWGR5VjhZY3lqRVFVWGRkMEFzUHh3bwpQTVpBRzJQbG1SVlhuRmMyZWhuT0tOVDVxdklGeXJTb0JYS285ckNmZi9CN0kwR3hpNzBNOHVML0JRS2Z5MWpBCkRvSEp1WndWVXpMa0RkZU1lL2ZiK1dXNFF1YUFVbHBDCi0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=",
+        "private": "LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1JR2tBZ0VCQkRBME5VbVMzOHoxcU1QK2R6Sjk4Y3J4bFkzZXhzN0tOVVlqZ25zODZzZ0ZBTmhPd3YyT09uVVgKcTcvbHZZUW1QN1NnQndZRks0RUVBQ0toWkFOaUFBUlpRSGY4T24xVkZkM0pYeGh6S01SQlJkMTNRQ3cvSENnOAp4a0FiWStXWkZWZWNWelo2R2M0bzFQbXE4Z1hLdEtnRmNxajJzSjkvOEhzalFiR0x2UXp5NHY4RkFwL0xXTUFPCmdjbTVuQlZUTXVRTjE0eDc5OXY1WmJoQzVvQlNXa0k9Ci0tLS0tRU5EIEVDIFBSSVZBVEUgS0VZLS0tLS0K",
+        "message": "ECDSA with P-384",
+        "scheme": "ecdsa-with-SHA1",
+        "signature": "3066023100fb65dfe219093dbb7b468ccded39931d845ff73a2386b9fd7a6a9860c5cdc56f120370dfa6b0441e14d30e5bfca371740231008f603c40136c059eb8f2de65fb9e773a79ed59102dcc1bfcc863c254f93a8139d579f952fa9e9512ba4ef75660b7565a"
+      },
+      {
+        "public": "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlHYk1CQUdCeXFHU000OUFnRUdCU3VCQkFBakE0R0dBQVFBWEhXdnJrSXF5NnBGZXMxT1E4MmQ2NDYwZUxaOQo5UFdCWGdmaHBLRU1nY2NNamZtQ3FncUV5TGY2YjE3WUVJNEQxdGZKVTFvR3pXQm0zOUhsTDVYVm95OEJyZlBSCm1SRWQ5ZEJOMmg5YWVJYjZtMVFKWDdYdGVPWHljNklobi81dU1Za1Fnb3RpRlkwaVRqeitSaGQwbi9xN3krTlYKL3NCYTlNcFVjdEgvanpIRkQ5Zz0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==",
+        "private": "LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1JSGNBZ0VCQkVJQlNwRlprcnorTzAzK3ErdnlOdUJPMng2S3JKR1NVSzNQT1kyQkdaR0RpUUV3b3lkK1llS1EKNWVwdjJDL2puVEJlc1lVeXhrck5MMHF4VTZpamthdE44bmlnQndZRks0RUVBQ09oZ1lrRGdZWUFCQUJjZGErdQpRaXJMcWtWNnpVNUR6WjNyanJSNHRuMzA5WUZlQitHa29ReUJ4d3lOK1lLcUNvVEl0L3B2WHRnUWpnUFcxOGxUCldnYk5ZR2JmMGVVdmxkV2pMd0d0ODlHWkVSMzEwRTNhSDFwNGh2cWJWQWxmdGUxNDVmSnpvaUdmL200eGlSQ0MKaTJJVmpTSk9QUDVHRjNTZitydkw0MVgrd0ZyMHlsUnkwZitQTWNVUDJBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=",
+        "message": "ECDSA with P-521",
+        "scheme": "ecdsa-with-SHA1",
+        "signature": "3081880242010dafc92bec374d0fb6b191fe7f007b753a4734511d9ac66cd98ebd410596981e0db3dc4fe043709094ebe5b1f8a87611ddf63ea0fa2037a591950c8669a3f7863f0242018a0d1ed724b8bb5e5fa2be736620c954c6f1428d3c01062e3aec53bccd530ae6ca5e69c4be5d5a3ea1acb70c0d70fa8b495df2653df7005f7ccdca277ace70caca"
       }
     ],
     "rsa": [