Latest update.

doc/man1/openssl-dgst.pod

@@ -123,6 +123,9 @@ The actual signature to verify.
 
 Create a hashed MAC using "key".
 
+The L<openssl-mac(1)> command should be preferred to using this command line
+option.
+
 =item B<-mac alg>
 
 Create MAC (keyed Message Authentication Code). The most popular MAC
@@ -131,6 +134,9 @@ which are not based on hash, for instance B<gost-mac> algorithm,
 supported by B<ccgost> engine. MAC keys and other options should be set
 via B<-macopt> parameter.
 
+The L<openssl-mac(1)> command should be preferred to using this command line
+option.
+
 =item B<-macopt nm:v>
 
 Passes options to MAC algorithm, specified by B<-mac> key.
@@ -152,6 +158,9 @@ for example exactly 32 chars for gost-mac.
 
 =back
 
+The L<openssl-mac(1)> command should be preferred to using this command line
+option.
+
 =item B<-rand file...>
 
 A file or files containing random data used to seed the random number
@@ -229,6 +238,13 @@ Hex signatures cannot be verified using B<openssl>.  Instead, use "xxd -r"
 or similar program to transform the hex signature into a binary signature
 prior to verification.
 
+The L<openssl-mac(1)> command is preferred over the B<-hmac>, B<-mac> and
+B<-macopt> command line options.
+
+=head1 SEE ALSO
+
+L<openssl-mac(1)>
+
 =head1 HISTORY
 
 The default digest was changed from MD5 to SHA256 in OpenSSL 1.1.0.

doc/man1/openssl-info.pod

@@ -8,14 +8,14 @@ openssl-info - print OpenSSL built-in information
 
 B<openssl info>
 [B<-help>]
-[B<-configdir> | B<-c>]
-[B<-enginesdir> | B<-e>]
-[B<-modulesdir> | B<-m>]
+[B<-configdir>]
+[B<-enginesdir>]
+[B<-modulesdir> ]
 [B<-dsoext>]
 [B<-dirfilesep>]
-[B<-listsep]>
-[B<-seeds]>
-[B<-cpusettings]>
+[B<-listsep>]
+[B<-seeds>]
+[B<-cpusettings>]
 
 =head1 DESCRIPTION
 
@@ -34,15 +34,15 @@ command.
 
 Print out a usage message.
 
-=item B<-configdir>, B<-c>
+=item B<-configdir>
 
 Outputs the default directory for OpenSSL configuration files.
 
-=item B<-enginesdir>, B<-e>
+=item B<-enginesdir>
 
 Outputs the default directory for OpenSSL engine modules.
 
-=item B<-modulesdir>, B<-m>
+=item B<-modulesdir>
 
 Outputs the default directory for OpenSSL dynamically loadable modules
 other than engine modules.

doc/man1/openssl-s_time.pod

@@ -22,6 +22,10 @@ B<openssl> B<s_time>
 [B<-nameopt option>]
 [B<-time seconds>]
 [B<-ssl3>]
+[B<-tls1>]
+[B<-tls1_1>]
+[B<-tls1_2>]
+[B<-tls1_3>]
 [B<-bugs>]
 [B<-cipher cipherlist>]
 [B<-ciphersuites val>]
@@ -109,19 +113,13 @@ Performs the timing test using the same session ID; this can be used as a test
 that session caching is working. If neither B<-new> nor B<-reuse> are
 specified, they are both on by default and executed in sequence.
 
-=item B<-ssl3>
+=item B<-ssl3>, B<-tls1>, B<-tls1_1>, B<-tls1_2>, B<-tls1_3>
 
-This option disables the use of SSL version 3. By default
-the initial handshake uses a method which should be compatible with all
-servers and permit them to use SSL v3 or TLS as appropriate.
-
-The timing program is not as rich in options to turn protocols on and off as
-the L<s_client(1)> program and may not connect to all servers.
-Unfortunately there are a lot of ancient and broken servers in use which
-cannot handle this technique and will fail to connect. Some servers only
-work if TLS is turned off with the B<-ssl3> option.
-
-Note that this option may not be available, depending on how
+These options enable specific SSL or TLS protocol versions for the handshake
+initiated by B<s_time>.
+By default B<s_time> negotiates the highest mutually supported protocol
+version.
+Note that not all protocols and flags may be available, depending on how
 OpenSSL was built.
 
 =item B<-bugs>

doc/man3/EVP_DigestInit.pod

@@ -68,9 +68,9 @@ EVP_MD_do_all_ex
 
  const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx);
  const char *EVP_MD_CTX_name(const EVP_MD_CTX *ctx);
- int EVP_MD_CTX_size(const EVP_MD *ctx);
- int EVP_MD_CTX_block_size(const EVP_MD *ctx);
- int EVP_MD_CTX_type(const EVP_MD *ctx);
+ int EVP_MD_CTX_size(const EVP_MD_CTX *ctx);
+ int EVP_MD_CTX_block_size(const EVP_MD_CTX *ctx);
+ int EVP_MD_CTX_type(const EVP_MD_CTX *ctx);
  void *EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx);
  int (*EVP_MD_CTX_update_fn(EVP_MD_CTX *ctx))(EVP_MD_CTX *ctx,
                                               const void *data, size_t count);