various cleanup;

6 files changed, 36 insertions, 33 deletions

diff --git a/lib/libcrypto/man/HMAC.3 b/lib/libcrypto/man/HMAC.3
index fc82e775638..488a33fa807 100644
--- a/lib/libcrypto/man/HMAC.3
+++ b/lib/libcrypto/man/HMAC.3
@@ -1,13 +1,16 @@
-.\"	$OpenBSD: HMAC.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"	$OpenBSD: HMAC.3,v 1.3 2016/11/22 21:38:18 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 22 2016 $
 .Dt HMAC 3
 .Os
 .Sh NAME
 .Nm HMAC ,
+.Nm HMAC_CTX_Init ,
 .Nm HMAC_Init ,
+.Nm HMAC_Init_ex ,
 .Nm HMAC_Update ,
 .Nm HMAC_Final ,
+.Nm HMAC_CTX_cleanup ,
 .Nm HMAC_cleanup
 .Nd HMAC message authentication code
 .Sh SYNOPSIS
diff --git a/lib/libcrypto/man/MD5.3 b/lib/libcrypto/man/MD5.3
index 305af8053e0..98f69971b92 100644
--- a/lib/libcrypto/man/MD5.3
+++ b/lib/libcrypto/man/MD5.3
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: MD5.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"	$OpenBSD: MD5.3,v 1.3 2016/11/22 21:38:18 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 22 2016 $
 .Dt MD5 3
 .Os
 .Sh NAME
@@ -85,7 +85,7 @@
 .Fa "MD5_CTX *c"
 .Fc
 .Sh DESCRIPTION
-MD2, MD4, and MD5 are cryptographic hash functions with a 128 bit
+MD2, MD4, and MD5 are cryptographic hash functions with a 128-bit
 output.
 .Pp
 .Fn MD2 ,
diff --git a/lib/libcrypto/man/OBJ_nid2obj.3 b/lib/libcrypto/man/OBJ_nid2obj.3
index b4149a73aac..22cc5723230 100644
--- a/lib/libcrypto/man/OBJ_nid2obj.3
+++ b/lib/libcrypto/man/OBJ_nid2obj.3
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: OBJ_nid2obj.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"	$OpenBSD: OBJ_nid2obj.3,v 1.3 2016/11/22 21:38:18 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 22 2016 $
 .Dt OBJ_NID2OBJ 3
 .Os
 .Sh NAME
@@ -8,16 +8,16 @@
 .Nm OBJ_nid2ln ,
 .Nm OBJ_nid2sn ,
 .Nm OBJ_obj2nid ,
-.Nm OBJ_txt2nid ,
 .Nm OBJ_ln2nid ,
 .Nm OBJ_sn2nid ,
-.Nm OBJ_cmp ,
-.Nm OBJ_dup ,
+.Nm OBJ_txt2nid ,
 .Nm OBJ_txt2obj ,
 .Nm OBJ_obj2txt ,
+.Nm OBJ_cmp ,
+.Nm OBJ_dup ,
 .Nm OBJ_create ,
 .Nm OBJ_cleanup
-.Nd ASN1 object utility functions
+.Nd ASN.1 object utility functions
 .Sh SYNOPSIS
 .In openssl/objects.h
 .Ft ASN1_OBJECT *
@@ -78,9 +78,9 @@
 .Ft void
 .Fn OBJ_cleanup void
 .Sh DESCRIPTION
-The ASN1 object utility functions process
+The ASN.1 object utility functions process
 .Vt ASN1_OBJECT
-structures which are a representation of the ASN1 OBJECT IDENTIFIER
+structures which are a representation of the ASN.1 OBJECT IDENTIFIER
 (OID) type.
 .Pp
 .Fn OBJ_nid2obj ,
@@ -196,8 +196,8 @@ is only a single constant structure for each table object.
 Objects which are not in the table have the NID value
 .Dv NID_undef .
 .Pp
-Objects do not need to be in the internal tables to be processed, the
-functions
+Objects do not need to be in the internal tables to be processed:
+the functions
 .Fn OBJ_txt2obj
 and
 .Fn OBJ_obj2txt
@@ -213,7 +213,7 @@ if an error occurred.
 .Fn OBJ_nid2ln
 and
 .Fn OBJ_nid2sn
-returns a valid string or
+return a valid string or
 .Dv NULL
 on error.
 .Pp
@@ -228,20 +228,20 @@ on error.
 .Sh EXAMPLES
 Create an object for
 .Sy commonName :
-.Bd -literal
+.Bd -literal -offset indent
 ASN1_OBJECT *o;
 o = OBJ_nid2obj(NID_commonName);
 .Ed
 .Pp
 Check if an object is
-.Sy commonName
-.Bd -literal
+.Sy commonName :
+.Bd -literal -offset indent
 if (OBJ_obj2nid(obj) == NID_commonName)
 	/* Do something */
 .Ed
 .Pp
 Create a new NID and initialize an object from it:
-.Bd -literal
+.Bd -literal -offset indent
 int new_nid;
 ASN1_OBJECT *obj;
 new_nid = OBJ_create("1.2.3.4", "NewOID", "New Object Identifier");
@@ -249,7 +249,7 @@ obj = OBJ_nid2obj(new_nid);
 .Ed
 .Pp
 Create a new object directly:
-.Bd -literal
+.Bd -literal -offset indent
 obj = OBJ_txt2obj("1.2.3.4", 1);
 .Ed
 .Sh SEE ALSO
diff --git a/lib/libcrypto/man/OPENSSL_config.3 b/lib/libcrypto/man/OPENSSL_config.3
index e2e277d1296..42cc6159d99 100644
--- a/lib/libcrypto/man/OPENSSL_config.3
+++ b/lib/libcrypto/man/OPENSSL_config.3
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: OPENSSL_config.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"	$OpenBSD: OPENSSL_config.3,v 1.3 2016/11/22 21:38:18 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 22 2016 $
 .Dt OPENSSL_CONFIG 3
 .Os
 .Sh NAME
@@ -65,12 +65,12 @@ The environment variable
 .Ev OPENSSL_CONF
 can be set to specify the location of the configuration file.
 .Pp
-Currently ASN1 OBJECT and ENGINE configuration can be performed.
+Currently ASN.1 OBJECT and ENGINE configuration can be performed.
 .Pp
 There are several reasons why calling the OpenSSL configuration routines
 is advisable.
 For example new ENGINE functionality was added to OpenSSL 0.9.7.
-In OpenSSL 0.9.7 control functions can be supported by ENGINEs, this can be
+In OpenSSL 0.9.7 control functions can be supported by ENGINEs which can be
 used (among other things) to load dynamic ENGINEs from shared libraries
 (DSOs).
 However very few applications currently support the control interface
@@ -113,5 +113,5 @@ It is however
 better than nothing.
 Applications which need finer control over their configuration
 functionality should use the configuration functions such as
-.Xr CONF_load_modules 3
+.Xr CONF_modules_load 3
 directly.
diff --git a/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 b/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
index f56d5e8c9d8..3f64c2987ab 100644
--- a/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
+++ b/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: OPENSSL_load_builtin_modules.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"	$OpenBSD: OPENSSL_load_builtin_modules.3,v 1.3 2016/11/22 21:38:18 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 22 2016 $
 .Dt OPENSSL_LOAD_BUILTIN_MODULES 3
 .Os
 .Sh NAME
@@ -24,7 +24,7 @@ list.
 They can then be used by the OpenSSL configuration code.
 .Pp
 .Fn ASN1_add_oid_module
-adds just the ASN1 OBJECT module.
+adds just the ASN.1 OBJECT module.
 .Pp
 .Fn ENGINE_add_conf_module
 adds just the ENGINE configuration module.
diff --git a/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 b/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
index 26910d45b00..7a31b9d1e8d 100644
--- a/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
+++ b/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: OpenSSL_add_all_algorithms.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"	$OpenBSD: OpenSSL_add_all_algorithms.3,v 1.3 2016/11/22 21:38:18 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 22 2016 $
 .Dt OPENSSL_ADD_ALL_ALGORITHMS 3
 .Os
 .Sh NAME
@@ -21,7 +21,7 @@
 .Fn EVP_cleanup void
 .Sh DESCRIPTION
 OpenSSL keeps an internal table of digest algorithms and ciphers.
-It uses this table to lookup ciphers via functions such as
+It uses this table to look up ciphers via functions such as
 .Xr EVP_get_cipherbyname 3 .
 .Pp
 .Fn OpenSSL_add_all_algorithms
@@ -47,7 +47,7 @@ An application does not need to add algorithms to use them explicitly,
 for example by
 .Xr EVP_sha1 3 .
 It just needs to add them if it (or any of the functions it calls) needs
-to lookup algorithms.
+to look up algorithms.
 .Pp
 The cipher and digest lookup functions are used in many parts of the
 library.