1 files changed, 6 insertions, 94 deletions
diff --git a/src/lib/libcrypto/man/dh.3 b/src/lib/libcrypto/man/dh.3
index 6a790d3e6b..d599fa0783 100644
--- a/src/lib/libcrypto/man/dh.3
+++ b/src/lib/libcrypto/man/dh.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: dh.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"     $OpenBSD: dh.3,v 1.3 2016/11/06 15:57:38 schwarze Exp $
 .\"
 .Dd $Mdocdate: November 6 2016 $
 .Dt DH 3
@@ -8,96 +8,6 @@
 .Nd Diffie-Hellman key agreement
 .Sh SYNOPSIS
 .In openssl/dh.h
-.In openssl/engine.h
-.Ft DH *
-.Fn DH_new void
-.Ft void
-.Fo DH_free
-.Fa "DH *dh"
-.Fc
-.Ft int
-.Fo DH_size
-.Fa "const DH *dh"
-.Fc
-.Ft DH *
-.Fo DH_generate_parameters
-.Fa "int prime_len"
-.Fa "int generator"
-.Fa "void (*callback)(int, int, void *)"
-.Fa "void *cb_arg"
-.Fc
-.Ft int
-.Fo DH_check
-.Fa "const DH *dh"
-.Fa "int *codes"
-.Fc
-.Ft int
-.Fo DH_generate_key
-.Fa "DH *dh"
-.Fc
-.Ft int
-.Fo DH_compute_key
-.Fa "unsigned char *key"
-.Fa "BIGNUM *pub_key"
-.Fa "DH *dh"
-.Fc
-.Ft void
-.Fo DH_set_default_method
-.Fa "const DH_METHOD *meth"
-.Fc
-.Ft const DH_METHOD *
-.Fn DH_get_default_method void
-.Ft int
-.Fo DH_set_method
-.Fa "DH *dh"
-.Fa "const DH_METHOD *meth"
-.Fc
-.Ft DH *
-.Fo DH_new_method
-.Fa "ENGINE *engine"
-.Fc
-.Ft const DH_METHOD *
-.Fn DH_OpenSSL void
-.Ft int
-.Fo DH_get_ex_new_index
-.Fa "long argl"
-.Fa "char *argp"
-.Fa "int (*new_func)()"
-.Fa "int (*dup_func)()"
-.Fa "void (*free_func)()"
-.Fc
-.Ft int
-.Fo DH_set_ex_data
-.Fa "DH *d"
-.Fa "int idx"
-.Fa "char *arg"
-.Fc
-.Ft char *
-.Fo DH_get_ex_data
-.Fa "DH *d"
-.Fa "int idx"
-.Fc
-.Ft DH *
-.Fo d2i_DHparams
-.Fa "DH **a"
-.Fa "unsigned char **pp"
-.Fa "long length"
-.Fc
-.Ft int
-.Fo i2d_DHparams
-.Fa "const DH *a"
-.Fa "unsigned char **pp"
-.Fc
-.Ft int
-.Fo DHparams_print_fp
-.Fa "FILE *fp"
-.Fa "const DH *x"
-.Fc
-.Ft int
-.Fo DHparams_print
-.Fa "BIO *bp"
-.Fa "const DH *x"
-.Fc
 .Sh DESCRIPTION
 These functions implement the Diffie-Hellman key agreement protocol.
 The generation of shared DH parameters is described in
@@ -138,13 +48,15 @@ or modify keys.
 .Sh SEE ALSO
 .Xr bn 3 ,
 .Xr d2i_DHparams 3 ,
-.Xr DH_compute_key 3 ,
+.Xr DH_generate_key 3 ,
 .Xr DH_generate_parameters 3 ,
 .Xr DH_get_ex_new_index 3 ,
 .Xr DH_new 3 ,
 .Xr DH_set_method 3 ,
+.Xr DH_size 3 ,
+.Xr DHparams_print 3 ,
 .Xr dsa 3 ,
+.Xr DSA_dup_DH 3 ,
 .Xr engine 3 ,
 .Xr ERR 3 ,
-.Xr rsa 3 ,
+.Xr rsa 3
-.Xr RSA_print 3

diff --git a/src/lib/libcrypto/man/dh.3 b/src/lib/libcrypto/man/dh.3 index 6a790d3e6b..d599fa0783 100644 --- a/src/lib/libcrypto/man/dh.3 +++ b/src/lib/libcrypto/man/dh.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: dh.3,v 1.2 2016/11/06 15:52:50 jmc Exp $	1	.\" $OpenBSD: dh.3,v 1.3 2016/11/06 15:57:38 schwarze Exp $
2	.\"	2	.\"
3	.Dd $Mdocdate: November 6 2016 $	3	.Dd $Mdocdate: November 6 2016 $
4	.Dt DH 3	4	.Dt DH 3
@@ -8,96 +8,6 @@
8	.Nd Diffie-Hellman key agreement	8	.Nd Diffie-Hellman key agreement
9	.Sh SYNOPSIS	9	.Sh SYNOPSIS
10	.In openssl/dh.h	10	.In openssl/dh.h
11	.In openssl/engine.h
12	.Ft DH *
13	.Fn DH_new void
14	.Ft void
15	.Fo DH_free
16	.Fa "DH *dh"
17	.Fc
18	.Ft int
19	.Fo DH_size
20	.Fa "const DH *dh"
21	.Fc
22	.Ft DH *
23	.Fo DH_generate_parameters
24	.Fa "int prime_len"
25	.Fa "int generator"
26	.Fa "void (callback)(int, int, void )"
27	.Fa "void *cb_arg"
28	.Fc
29	.Ft int
30	.Fo DH_check
31	.Fa "const DH *dh"
32	.Fa "int *codes"
33	.Fc
34	.Ft int
35	.Fo DH_generate_key
36	.Fa "DH *dh"
37	.Fc
38	.Ft int
39	.Fo DH_compute_key
40	.Fa "unsigned char *key"
41	.Fa "BIGNUM *pub_key"
42	.Fa "DH *dh"
43	.Fc
44	.Ft void
45	.Fo DH_set_default_method
46	.Fa "const DH_METHOD *meth"
47	.Fc
48	.Ft const DH_METHOD *
49	.Fn DH_get_default_method void
50	.Ft int
51	.Fo DH_set_method
52	.Fa "DH *dh"
53	.Fa "const DH_METHOD *meth"
54	.Fc
55	.Ft DH *
56	.Fo DH_new_method
57	.Fa "ENGINE *engine"
58	.Fc
59	.Ft const DH_METHOD *
60	.Fn DH_OpenSSL void
61	.Ft int
62	.Fo DH_get_ex_new_index
63	.Fa "long argl"
64	.Fa "char *argp"
65	.Fa "int (*new_func)()"
66	.Fa "int (*dup_func)()"
67	.Fa "void (*free_func)()"
68	.Fc
69	.Ft int
70	.Fo DH_set_ex_data
71	.Fa "DH *d"
72	.Fa "int idx"
73	.Fa "char *arg"
74	.Fc
75	.Ft char *
76	.Fo DH_get_ex_data
77	.Fa "DH *d"
78	.Fa "int idx"
79	.Fc
80	.Ft DH *
81	.Fo d2i_DHparams
82	.Fa "DH **a"
83	.Fa "unsigned char **pp"
84	.Fa "long length"
85	.Fc
86	.Ft int
87	.Fo i2d_DHparams
88	.Fa "const DH *a"
89	.Fa "unsigned char **pp"
90	.Fc
91	.Ft int
92	.Fo DHparams_print_fp
93	.Fa "FILE *fp"
94	.Fa "const DH *x"
95	.Fc
96	.Ft int
97	.Fo DHparams_print
98	.Fa "BIO *bp"
99	.Fa "const DH *x"
100	.Fc
101	.Sh DESCRIPTION	11	.Sh DESCRIPTION
102	These functions implement the Diffie-Hellman key agreement protocol.	12	These functions implement the Diffie-Hellman key agreement protocol.
103	The generation of shared DH parameters is described in	13	The generation of shared DH parameters is described in
@@ -138,13 +48,15 @@ or modify keys.
138	.Sh SEE ALSO	48	.Sh SEE ALSO
139	.Xr bn 3 ,	49	.Xr bn 3 ,
140	.Xr d2i_DHparams 3 ,	50	.Xr d2i_DHparams 3 ,
141	.Xr DH_compute_key 3 ,	51	.Xr DH_generate_key 3 ,
142	.Xr DH_generate_parameters 3 ,	52	.Xr DH_generate_parameters 3 ,
143	.Xr DH_get_ex_new_index 3 ,	53	.Xr DH_get_ex_new_index 3 ,
144	.Xr DH_new 3 ,	54	.Xr DH_new 3 ,
145	.Xr DH_set_method 3 ,	55	.Xr DH_set_method 3 ,
		56	.Xr DH_size 3 ,
		57	.Xr DHparams_print 3 ,
146	.Xr dsa 3 ,	58	.Xr dsa 3 ,
		59	.Xr DSA_dup_DH 3 ,
147	.Xr engine 3 ,	60	.Xr engine 3 ,
148	.Xr ERR 3 ,	61	.Xr ERR 3 ,
149	.Xr rsa 3 ,	62	.Xr rsa 3
150	.Xr RSA_print 3