Merge f6d27c0 into 79e2f37

lib/elliptic/ec/key.js

@@ -1,6 +1,9 @@
 'use strict';
 
 var BN = require('bn.js');
+var elliptic = require('../../elliptic');
+var utils = elliptic.utils;
+var assert = utils.assert;
 
 function KeyPair(ec, options) {
   this.ec = ec;
@@ -81,6 +84,17 @@ KeyPair.prototype._importPrivate = function _importPrivate(key, enc) {
 
 KeyPair.prototype._importPublic = function _importPublic(key, enc) {
   if (key.x || key.y) {
+    // Montgomery points only have an x coordinate.
+    // Weierstrass points on the other hand have both an x and a y corrdinate.
+    // Therefore if the curve is of type 'short' we have the folling:
+    // • If x is missing, there are 1 or 2 y points.
+    // • If y is missing, there are 1 or 3 x points.
+    // We don't know, which point is wanted.
+    if (this.ec.curve.type == 'mont') {
+      assert(key.x, 'Need x coordinate');
+    } else if (this.ec.curve.type == 'short') {
+      assert(key.x && key.y, 'Need both x and y coordinate');
+    }
     this.pub = this.ec.curve.point(key.x, key.y);
     return;
   }