Pull in sshkey.c r1.148 to remove dependency on EC_GROUP_method_of()
EC_METHOD_get_field_type().

Index: openssh/sshkey.c
--- a/sshkey.c.orig
+++ b/sshkey.c
@@ -2592,14 +2592,6 @@ sshkey_ec_validate_public(const EC_GROUP *group, const
 	 * EC_POINT_oct2point then the caller will need to explicitly check.
 	 */
 
-	/*
-	 * We shouldn't ever hit this case because bignum_get_ecpoint()
-	 * refuses to load GF2m points.
-	 */
-	if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) !=
-	    NID_X9_62_prime_field)
-		goto out;
-
 	/* Q != infinity */
 	if (EC_POINT_is_at_infinity(group, public))
 		goto out;
@@ -2697,11 +2689,6 @@ sshkey_dump_ec_point(const EC_GROUP *group, const EC_P
 	}
 	if ((x = BN_new()) == NULL || (y = BN_new()) == NULL) {
 		fprintf(stderr, "%s: BN_new failed\n", __func__);
-		goto out;
-	}
-	if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) !=
-	    NID_X9_62_prime_field) {
-		fprintf(stderr, "%s: group is not a prime field\n", __func__);
 		goto out;
 	}
 	if (EC_POINT_get_affine_coordinates_GFp(group, point,