6 files changed, 54 insertions, 53 deletions

diff --git a/src/lib/libcrypto/man/EC_GFp_simple_method.3 b/src/lib/libcrypto/man/EC_GFp_simple_method.3
index c8c5e9883f..a019e43093 100644
--- a/src/lib/libcrypto/man/EC_GFp_simple_method.3
+++ b/src/lib/libcrypto/man/EC_GFp_simple_method.3
@@ -1,6 +1,6 @@
-.\"     $OpenBSD: EC_GFp_simple_method.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"     $OpenBSD: EC_GFp_simple_method.3,v 1.3 2016/11/15 09:25:45 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 15 2016 $
 .Dt EC_GFP_SIMPLE_METHOD 3
 .Os
 .Sh NAME
@@ -42,7 +42,7 @@ an implementation method must be provided.
 The functions described here all return a const pointer to an
 .Sy EC_METHOD
 structure that can be passed to
-.Xr EC_GROUP_new .
+.Xr EC_GROUP_new 3 .
 It is important that the correct implementation type for the form
 of curve selected is used.
 .Pp
@@ -54,7 +54,7 @@ For Fp curves the lowest common denominator implementation is the
 implementation.
 All other implementations are based on this one.
 .Fn EC_GFp_mont_method
-adds the use of montgomery multiplication (see
+adds the use of Montgomery multiplication (see
 .Xr BN_mod_mul_montgomery 3 ) .
 .Fn EC_GFp_nist_method
 offers an implementation optimised for use with NIST recommended
@@ -67,7 +67,7 @@ The functions
 .Fn EC_GFp_nistp256_method ,
 and
 .Fn EC_GFp_nistp521_method
-offer 64 bit optimised implementations for the NIST P224, P256 and
+offer 64-bit optimised implementations for the NIST P224, P256 and
 P521 curves respectively.
 Note, however, that these implementations are not available on all
 platforms.
diff --git a/src/lib/libcrypto/man/EC_GROUP_copy.3 b/src/lib/libcrypto/man/EC_GROUP_copy.3
index 25ef67344d..37b3d089bc 100644
--- a/src/lib/libcrypto/man/EC_GROUP_copy.3
+++ b/src/lib/libcrypto/man/EC_GROUP_copy.3
@@ -1,6 +1,6 @@
-.\"     $OpenBSD: EC_GROUP_copy.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"     $OpenBSD: EC_GROUP_copy.3,v 1.3 2016/11/15 09:25:45 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 15 2016 $
 .Dt EC_GROUP_COPY 3
 .Os
 .Sh NAME
@@ -173,9 +173,9 @@ of
 .Fa group .
 .Pp
 .Fn EC_GROUP_set_generator
-sets curve paramaters that must be agreed by all participants using
+sets curve parameters that must be agreed by all participants using
 the curve.
-These paramaters include the
+These parameters include the
 .Fa generator ,
 the
 .Fa order
@@ -219,8 +219,8 @@ If a curve does not have a NID associated with it, then
 will return 0.
 .Pp
 The asn1_flag value on a curve is used to determine whether there is a
-specific ASN1 OID to describe the curve or not.
-If the asn1_flag is 1 then this is a named curve with an associated ASN1 OID.
+specific ASN.1 OID to describe the curve or not.
+If the asn1_flag is 1 then this is a named curve with an associated ASN.1 OID.
 If not then asn1_flag is 0.
 The functions
 .Fn EC_GROUP_get_asn1_flag
@@ -231,7 +231,7 @@ If set, then the curve_name must also be set.
 .Pp
 The point_conversion_form for a curve controls how
 .Vt EC_POINT
-data is encoded as ASN1 as defined in X9.62 (ECDSA).
+data is encoded as ASN.1 as defined in X9.62 (ECDSA).
 .Vt point_conversion_form_t
 is an enum defined as follows:
 .Bd -literal
@@ -253,7 +253,7 @@ the point is encoded as an octet signifying the UNCOMPRESSED form
 has been used followed by the octets for x, followed by the octets
 for y.
 .Pp
-For any given x co-ordinate for a point on a curve it is possible to
+For any given x coordinate for a point on a curve it is possible to
 derive two possible y values.
 For
 .Dv POINT_CONVERSION_COMPRESSED
@@ -294,7 +294,7 @@ It is also possible to set a custom seed using
 and passing a pointer to a memory block, along with the length of
 the seed.
 Again, the EC library will not use this seed value, although it will be
-preserved in any ASN1 based communications.
+preserved in any ASN.1 based communications.
 .Pp
 .Fn EC_GROUP_get_degree
 gets the degree of the field.
@@ -391,7 +391,7 @@ on error.
 .Fn EC_GROUP_get_point_conversion_form ,
 and
 .Fn EC_GROUP_get_degree
-return the order, cofactor, curve name (NID), ASN1 flag,
+return the order, cofactor, curve name (NID), ASN.1 flag,
 point_conversion_form and degree for the specified curve, respectively.
 If there is no curve name associated with a curve then
 .Fn EC_GROUP_get_curve_name
diff --git a/src/lib/libcrypto/man/EC_GROUP_new.3 b/src/lib/libcrypto/man/EC_GROUP_new.3
index 6534e8fc99..7fc2b21980 100644
--- a/src/lib/libcrypto/man/EC_GROUP_new.3
+++ b/src/lib/libcrypto/man/EC_GROUP_new.3
@@ -1,6 +1,6 @@
-.\"     $OpenBSD: EC_GROUP_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"     $OpenBSD: EC_GROUP_new.3,v 1.3 2016/11/15 09:25:45 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 15 2016 $
 .Dt EC_GROUP_NEW 3
 .Os
 .Sh NAME
@@ -197,7 +197,7 @@ typedef struct {
 .Pp
 Each
 .Vt EC_builtin_curve
-item has a unique integer id
+item has a unique integer ID
 .Pq Fa nid
 and a human readable comment string describing the curve.
 .Pp
diff --git a/src/lib/libcrypto/man/EC_KEY_new.3 b/src/lib/libcrypto/man/EC_KEY_new.3
index dd283cbb80..20fefc7caf 100644
--- a/src/lib/libcrypto/man/EC_KEY_new.3
+++ b/src/lib/libcrypto/man/EC_KEY_new.3
@@ -1,6 +1,6 @@
-.\"     $OpenBSD: EC_KEY_new.3,v 1.4 2016/11/06 16:54:58 jmc Exp $
+.\"     $OpenBSD: EC_KEY_new.3,v 1.5 2016/11/15 09:25:45 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 15 2016 $
 .Dt EC_KEY_NEW 3
 .Os
 .Sh NAME
@@ -204,7 +204,7 @@ Calling
 .Fn EC_KEY_free
 decrements the reference count for the
 .Vt EC_KEY
-object, and if it has dropped to zero, then frees the memory associated
+object and, if it has dropped to zero, then frees the memory associated
 with it.
 .Pp
 .Fn EC_KEY_copy
@@ -291,7 +291,7 @@ and
 .Dv EC_PKEY_NO_PUBKEY .
 These flags define the behaviour of how the
 .Fa key
-is converted into ASN1 in a call to
+is converted into ASN.1 in a call to
 .Fn i2d_ECPrivateKey .
 If
 .Dv EC_PKEY_NO_PARAMETERS
@@ -308,8 +308,8 @@ and
 .Fn EC_KEY_set_conv_form
 get and set the point_conversion_form for the
 .Fa key .
-For a description of point_conversion_forms please refer to
-.Xr EC_POINT_new 3 .
+For a description of point_conversion_form please refer to
+.Xr EC_GROUP_copy 3 .
 .Pp
 .Fn EC_KEY_insert_key_method_data
 and
@@ -318,7 +318,7 @@ enable the caller to associate arbitrary additional data specific
 to the elliptic curve scheme being used with the
 .Vt EC_KEY
 object.
-This data is treated as a "black box" by the ec library.
+This data is treated as a "black box" by the EC library.
 The data to be stored by
 .Fn EC_KEY_insert_key_method_data
 is provided in the
@@ -392,7 +392,8 @@ spaces.
 and
 .Fn EC_KEY_dup
 return a pointer to the newly created
-.Vt EC_KEY object or
+.Vt EC_KEY object
+or
 .Dv NULL
 on error.
 .Pp
diff --git a/src/lib/libcrypto/man/EC_POINT_add.3 b/src/lib/libcrypto/man/EC_POINT_add.3
index e432dd5757..782bf5a578 100644
--- a/src/lib/libcrypto/man/EC_POINT_add.3
+++ b/src/lib/libcrypto/man/EC_POINT_add.3
@@ -1,6 +1,6 @@
-.\"     $OpenBSD: EC_POINT_add.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"     $OpenBSD: EC_POINT_add.3,v 1.3 2016/11/15 09:25:45 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 15 2016 $
 .Dt EC_POINT_ADD 3
 .Os
 .Sh NAME
@@ -143,7 +143,7 @@ The functions
 and
 .Fn EC_POINTs_make_affine
 force the internal representation of the
-.Vt EC_POINT Ns (s)
+.Vt EC_POINT Ns s
 into the affine coordinate system.
 In the case of
 .Fn EC_POINTs_make_affine ,
diff --git a/src/lib/libcrypto/man/EC_POINT_new.3 b/src/lib/libcrypto/man/EC_POINT_new.3
index 7ece11bb6a..f31b2f881c 100644
--- a/src/lib/libcrypto/man/EC_POINT_new.3
+++ b/src/lib/libcrypto/man/EC_POINT_new.3
@@ -1,6 +1,6 @@
-.\"     $OpenBSD: EC_POINT_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"     $OpenBSD: EC_POINT_new.3,v 1.3 2016/11/15 09:25:45 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 15 2016 $
 .Dt EC_POINT_NEW 3
 .Os
 .Sh NAME
@@ -11,13 +11,13 @@
 .Nm EC_POINT_dup ,
 .Nm EC_POINT_method_of ,
 .Nm EC_POINT_set_to_infinity ,
-.Nm EC_POINT_set_Jprojective_coordinates ,
-.Nm EC_POINT_get_Jprojective_coordinates_GFp ,
 .Nm EC_POINT_set_affine_coordinates_GFp ,
-.Nm EC_POINT_get_affine_coordinates_GFp ,
-.Nm EC_POINT_set_compressed_coordinates_GFp ,
 .Nm EC_POINT_set_affine_coordinates_GF2m ,
+.Nm EC_POINT_get_affine_coordinates_GFp ,
 .Nm EC_POINT_get_affine_coordinates_GF2m ,
+.Nm EC_POINT_set_Jprojective_coordinates ,
+.Nm EC_POINT_get_Jprojective_coordinates_GFp ,
+.Nm EC_POINT_set_compressed_coordinates_GFp ,
 .Nm EC_POINT_set_compressed_coordinates_GF2m ,
 .Nm EC_POINT_point2oct ,
 .Nm EC_POINT_oct2point ,
@@ -61,25 +61,15 @@
 .Fa "EC_POINT *point"
 .Fc
 .Ft int
-.Fo EC_POINT_set_Jprojective_coordinates_GFp
+.Fo EC_POINT_set_affine_coordinates_GFp
 .Fa "const EC_GROUP *group"
 .Fa "EC_POINT *p"
 .Fa "const BIGNUM *x"
 .Fa "const BIGNUM *y"
-.Fa "const BIGNUM *z"
 .Fa "BN_CTX *ctx"
 .Fc
 .Ft int
-.Fo EC_POINT_get_Jprojective_coordinates_GFp
-.Fa "const EC_GROUP *group"
-.Fa "const EC_POINT *p"
-.Fa "BIGNUM *x"
-.Fa "BIGNUM *y"
-.Fa "BIGNUM *z"
-.Fa "BN_CTX *ctx"
-.Fc
-.Ft int
-.Fo EC_POINT_set_affine_coordinates_GFp
+.Fo EC_POINT_set_affine_coordinates_GF2m
 .Fa "const EC_GROUP *group"
 .Fa "EC_POINT *p"
 .Fa "const BIGNUM *x"
@@ -95,27 +85,37 @@
 .Fa "BN_CTX *ctx"
 .Fc
 .Ft int
-.Fo EC_POINT_set_compressed_coordinates_GFp
+.Fo EC_POINT_get_affine_coordinates_GF2m
 .Fa "const EC_GROUP *group"
-.Fa "EC_POINT *p"
-.Fa "const BIGNUM *x"
-.Fa "int y_bit"
+.Fa "const EC_POINT *p"
+.Fa "BIGNUM *x"
+.Fa "BIGNUM *y"
 .Fa "BN_CTX *ctx"
 .Fc
 .Ft int
-.Fo EC_POINT_set_affine_coordinates_GF2m
+.Fo EC_POINT_set_Jprojective_coordinates_GFp
 .Fa "const EC_GROUP *group"
 .Fa "EC_POINT *p"
 .Fa "const BIGNUM *x"
 .Fa "const BIGNUM *y"
+.Fa "const BIGNUM *z"
 .Fa "BN_CTX *ctx"
 .Fc
 .Ft int
-.Fo EC_POINT_get_affine_coordinates_GF2m
+.Fo EC_POINT_get_Jprojective_coordinates_GFp
 .Fa "const EC_GROUP *group"
 .Fa "const EC_POINT *p"
 .Fa "BIGNUM *x"
 .Fa "BIGNUM *y"
+.Fa "BIGNUM *z"
+.Fa "BN_CTX *ctx"
+.Fc
+.Ft int
+.Fo EC_POINT_set_compressed_coordinates_GFp
+.Fa "const EC_GROUP *group"
+.Fa "EC_POINT *p"
+.Fa "const BIGNUM *x"
+.Fa "int y_bit"
 .Fa "BN_CTX *ctx"
 .Fc
 .Ft int