Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
This commit is contained in:
Zhi Guan
2017-02-14 16:12:29 +08:00
parent d2254170b8
commit 43fed1108d
3503 changed files with 320546 additions and 408546 deletions

View File

@@ -2,7 +2,7 @@
=head1 NAME
d2i_DHparams, i2d_DHparams - PKCS#3 DH parameter functions.
d2i_DHparams, i2d_DHparams - PKCS#3 DH parameter functions
=head1 SYNOPSIS
@@ -16,15 +16,20 @@ d2i_DHparams, i2d_DHparams - PKCS#3 DH parameter functions.
These functions decode and encode PKCS#3 DH parameters using the
DHparameter structure described in PKCS#3.
Othewise these behave in a similar way to d2i_X509() and i2d_X509()
described in the L<d2i_X509(3)|d2i_X509(3)> manual page.
Otherwise these behave in a similar way to d2i_X509() and i2d_X509()
described in the L<d2i_X509(3)> manual page.
=head1 SEE ALSO
L<d2i_X509(3)|d2i_X509(3)>
L<d2i_X509(3)>
=head1 HISTORY
=head1 COPYRIGHT
TBA
Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
Licensed under the OpenSSL license (the "License"). You may not use
this file except in compliance with the License. You can obtain a copy
in the file LICENSE in the source distribution or at
L<https://www.openssl.org/source/license.html>.
=cut