Revert "Pass key structure to sshkey_ec_validate_*"

This reverts commit dca62f3.

kex_ecdh_dec_key_group uses it without a sshkey_ecdsa_pk structure.

Author: michaelforney

ssh-ecdsa.c

@@ -198,7 +198,8 @@ ssh_ecdsa_deserialize_public(const char *ktype, struct sshbuf *b,
 	ecdsa_pk->key.q = ecdsa_pk->data;
 	ecdsa_pk->key.qlen = ecdsa_qlen;
 	memcpy(ecdsa_pk->key.q, ecdsa_q, ecdsa_qlen);
-	if (sshkey_ec_validate_public(ecdsa_pk) != 0) {
+	if (sshkey_ec_validate_public(key->ecdsa_nid, ecdsa_q,
+	    ecdsa_qlen) != 0) {
 		r = SSH_ERR_KEY_INVALID_EC_VALUE;
 		goto out;
 	}
@@ -244,7 +245,8 @@ ssh_ecdsa_deserialize_private(const char *ktype, struct sshbuf *b,
 	ecdsa_sk->key.x = ecdsa_sk->data;
 	ecdsa_sk->key.xlen = ecdsa_xlen;
 	memcpy(ecdsa_sk->key.x, ecdsa_x, ecdsa_xlen);
-	if ((r = sshkey_ec_validate_private(ecdsa_sk)) != 0)
+	if ((r = sshkey_ec_validate_private(ecdsa_sk->key.curve,
+	    ecdsa_sk->key.x, ecdsa_sk->key.xlen)) != 0)
 		goto out;
 	/* success */
 	key->ecdsa_sk = ecdsa_sk;

sshkey.c

@@ -2568,33 +2568,29 @@ bn_less(const u_char *a, size_t alen, const u_char *b, size_t blen, u_int carry)
 }
 
 int
-sshkey_ec_validate_public(struct sshkey_ecdsa_pk *ecdsa_pk)
+sshkey_ec_validate_public(int nid, const u_char *q, size_t qlen)
 {
 	const br_ec_impl *ec;
-	int curve;
-	const u_char *q, *n;
-	size_t qlen, nlen, glen;
+	const u_char *n;
+	size_t nlen, glen;
 	size_t xoff, xlen, yoff, ylen;
 	u_char one[] = {1}, tmp[BR_EC_KBUF_PUB_MAX_SIZE];
 
-	curve = ecdsa_pk->key.curve;
-	q = ecdsa_pk->key.q;
-	qlen = ecdsa_pk->key.qlen;
 	ec = br_ec_get_default();
-	if ((ec->supported_curves & 1 << curve) == 0)
+	if ((ec->supported_curves & 1 << nid) == 0)
 		return SSH_ERR_LIBCRYPTO_ERROR;
 
-	if (curve == BR_EC_curve25519)
+	if (nid == BR_EC_curve25519)
 		return qlen == 32 ? 0 : SSH_ERR_KEY_INVALID_EC_VALUE;
 
-	ec->generator(curve, &glen);
-	n = ec->order(curve, &nlen);
+	ec->generator(nid, &glen);
+	n = ec->order(nid, &nlen);
 
 	/* We must check that the public key has the same size as
 	 * the generator, otherwise behavior of mul() below is
 	 * undefined. */
 	if (qlen > sizeof(tmp) || qlen != glen ||
-	    (xoff = ec->xoff(curve, &xlen)) != 1 ||
+	    (xoff = ec->xoff(nid, &xlen)) != 1 ||
 	    qlen != 1 + 2 * xlen || q[0] != 4)
 		return SSH_ERR_KEY_INVALID_EC_VALUE;
 	yoff = xoff + xlen;
@@ -2618,26 +2614,24 @@ sshkey_ec_validate_public(struct sshkey_ecdsa_pk *ecdsa_pk)
 	/* Attempt a multiplication to verify that the point is
 	 * actually on the curve. */
 	memcpy(tmp, q, qlen);
-	if (ec->mul(tmp, qlen, one, sizeof(one), curve) != 1)
+	if (ec->mul(tmp, qlen, one, sizeof(one), nid) != 1)
 		return SSH_ERR_KEY_INVALID_EC_VALUE;
 
 	return 0;
 }
 
 int
-sshkey_ec_validate_private(struct sshkey_ecdsa_sk *ecdsa_sk)
+sshkey_ec_validate_private(int nid, const u_char *x, size_t xlen)
 {
 	const br_ec_impl *ec;
-	const u_char *x, *n;
-	size_t xlen, nlen;
+	const u_char *n;
+	size_t nlen;
 
-	x = ecdsa_sk->key.x;
-	xlen = ecdsa_sk->key.xlen;
 	ec = br_ec_get_default();
-	if ((ec->supported_curves & 1 << ecdsa_sk->key.curve) == 0)
+	if ((ec->supported_curves & 1 << nid) == 0)
 		return SSH_ERR_LIBCRYPTO_ERROR;
 
-	n = ec->order(ecdsa_sk->key.curve, &nlen);
+	n = ec->order(nid, &nlen);
 
 	/* log2(private) > log2(order)/2 */
 	if (xlen <= nlen / 2 || xlen > nlen)
@@ -3410,8 +3404,10 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type,
 		memcpy(ecdsa_sk->key.x, ec->x, ec->xlen);
 
 		if (sshkey_curve_nid_to_name(ec->curve) == NULL ||
-		    sshkey_ec_validate_public(ecdsa_pk) != 0 ||
-		    sshkey_ec_validate_private(ecdsa_sk) != 0) {
+		    sshkey_ec_validate_public(ec->curve,
+		    ecdsa_pk->key.q, ecdsa_pk->key.qlen) != 0 ||
+		    sshkey_ec_validate_private(ec->curve,
+		    ecdsa_sk->key.x, ecdsa_sk->key.xlen) != 0) {
 			r = SSH_ERR_INVALID_FORMAT;
 			goto out;
 		}

sshkey.h

@@ -275,8 +275,10 @@ const char *	 sshkey_curve_nid_to_name(int);
 u_int		 sshkey_curve_nid_to_bits(int);
 int		 sshkey_ecdsa_bits_to_nid(int);
 int		 sshkey_ec_nid_to_hash_alg(int nid);
-int		 sshkey_ec_validate_public(struct sshkey_ecdsa_pk *);
-int		 sshkey_ec_validate_private(struct sshkey_ecdsa_sk *);
+int		 sshkey_ec_validate_public(int nid, const u_char *q,
+    size_t qlen);
+int		 sshkey_ec_validate_private(int nid, const u_char *x,
+    size_t xlen);
 const char	*sshkey_ssh_name(const struct sshkey *);
 const char	*sshkey_ssh_name_plain(const struct sshkey *);
 int		 sshkey_names_valid2(const char *, int, int);