4 files changed, 48 insertions, 28 deletions

diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index 568d65fa74..afec15edbf 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2016/11/28 23:02:16 schwarze Exp $
+# $OpenBSD: Makefile,v 1.60 2016/11/29 00:07:45 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -147,7 +147,6 @@ MAN=	\
         PKCS7_verify.3 \
         RAND_add.3 \
         RAND_bytes.3 \
-        RAND_cleanup.3 \
         RAND_load_file.3 \
         RAND_set_rand_method.3 \
         RC4.3 \
diff --git a/src/lib/libcrypto/man/RAND_add.3 b/src/lib/libcrypto/man/RAND_add.3
index 7137218cdc..0c4639063e 100644
--- a/src/lib/libcrypto/man/RAND_add.3
+++ b/src/lib/libcrypto/man/RAND_add.3
@@ -1,10 +1,25 @@
-.\"     $OpenBSD: RAND_add.3,v 1.3 2016/11/25 16:34:08 jmc Exp $
+.\"     $OpenBSD: RAND_add.3,v 1.4 2016/11/29 00:07:45 schwarze Exp $
 .\"
-.Dd $Mdocdate: November 25 2016 $
+.\" Copyright (c) 2014 Miod Vallat <miod@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd $Mdocdate: November 29 2016 $
 .Dt RAND_ADD 3
 .Os
 .Sh NAME
 .Nm RAND_add ,
+.Nm RAND_cleanup ,
 .Nm RAND_seed ,
 .Nm RAND_status
 .Nd add entropy to the PRNG (DEPRECATED)
@@ -17,6 +32,8 @@
 .Fa "double entropy"
 .Fc
 .Ft void
+.Fn RAND_cleanup void
+.Ft void
 .Fo RAND_seed
 .Fa "const void *buf"
 .Fa "int num"
@@ -29,6 +46,6 @@ generator to be controlled by external sources.
 .Pp
 They are kept for ABI compatibility but are no longer functional, and
 should not be used in new programs.
-.Sh SEE ALSO
-.Xr RAND_cleanup 3 ,
-.Xr RAND_load_file 3
+.Sh RETURN VALUES
+.Fn RAND_status
+always returns 1.
diff --git a/src/lib/libcrypto/man/RAND_cleanup.3 b/src/lib/libcrypto/man/RAND_cleanup.3
deleted file mode 100644
index 8c57e09fc7..0000000000
--- a/src/lib/libcrypto/man/RAND_cleanup.3
+++ /dev/null
@@ -1,18 +0,0 @@
-.\"     $OpenBSD: RAND_cleanup.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
-.\"
-.Dd $Mdocdate: November 6 2016 $
-.Dt RAND_CLEANUP 3
-.Os
-.Sh NAME
-.Nm RAND_cleanup
-.Nd erase the PRNG state
-.Sh SYNOPSIS
-.In openssl/rand.h
-.Ft void
-.Fn RAND_cleanup void
-.Sh DESCRIPTION
-.Fn RAND_cleanup
-erases the memory used by the PRNG.
-.Sh HISTORY
-.Fn RAND_cleanup
-is available in all versions of SSLeay and OpenSSL.
diff --git a/src/lib/libcrypto/man/RAND_set_rand_method.3 b/src/lib/libcrypto/man/RAND_set_rand_method.3
index cb5675d4aa..6f99335166 100644
--- a/src/lib/libcrypto/man/RAND_set_rand_method.3
+++ b/src/lib/libcrypto/man/RAND_set_rand_method.3
@@ -1,6 +1,20 @@
-.\"     $OpenBSD: RAND_set_rand_method.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"     $OpenBSD: RAND_set_rand_method.3,v 1.3 2016/11/29 00:07:45 schwarze Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.\" Copyright (c) 2014 Miod Vallat <miod@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd $Mdocdate: November 29 2016 $
 .Dt RAND_SET_RAND_METHOD 3
 .Os
 .Sh NAME
@@ -10,7 +24,7 @@
 .Nd select RAND method
 .Sh SYNOPSIS
 .In openssl/rand.h
-.Ft void
+.Ft int
 .Fo RAND_set_rand_method
 .Fa "const RAND_METHOD *meth"
 .Fc
@@ -24,6 +38,14 @@ to be replaced by arbitrary code.
 .Pp
 They are kept for ABI compatibility but are no longer functional, and
 should not be used in new programs.
+.Sh RETURN VALUES
+.Fn RAND_set_rand_method
+always returns 1.
+.Fn RAND_get_rand_method
+and
+.Fn RAND_SSLeay
+always return
+.Dv NULL .
 .Sh HISTORY
 .Fn RAND_set_rand_method ,
 .Fn RAND_get_rand_method ,