diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2015-04-18 12:23:12 +0200 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2015-06-09 00:46:59 +0200 |
| commit | 26c79d5641dcc85c666e0594c11663c00ec6c195 (patch) | |
| tree | 1b7c783623b0607d4138947c0b6aa6f2d54f2a49 /doc | |
| parent | return correct NID for undefined object (diff) | |
| download | openssl-26c79d5641dcc85c666e0594c11663c00ec6c195.tar.xz openssl-26c79d5641dcc85c666e0594c11663c00ec6c195.zip | |
Properly check certificate in case of export ciphers.
Reviewed-by: Matt Caswell <matt@openssl.org>
MR #588
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/crypto/DH_size.pod | 20 | ||||
| -rw-r--r-- | doc/crypto/RSA_size.pod | 19 | ||||
| -rw-r--r-- | doc/crypto/dh.pod | 2 | ||||
| -rw-r--r-- | doc/crypto/rsa.pod | 2 |
4 files changed, 25 insertions, 18 deletions
diff --git a/doc/crypto/DH_size.pod b/doc/crypto/DH_size.pod index 97f26fda78..e73f32589a 100644 --- a/doc/crypto/DH_size.pod +++ b/doc/crypto/DH_size.pod @@ -2,32 +2,38 @@ =head1 NAME -DH_size - get Diffie-Hellman prime size +DH_size, DH_bits - get Diffie-Hellman prime size =head1 SYNOPSIS - #include <openssl/dh.h> +#include <openssl/dh.h> - int DH_size(DH *dh); +int DH_size(const DH *dh); + +int DH_bits(const DH *dh); =head1 DESCRIPTION -This function returns the Diffie-Hellman size in bytes. It can be used +DH_size() returns the Diffie-Hellman prime size in bytes. It can be used to determine how much memory must be allocated for the shared secret computed by DH_compute_key(). -B<dh-E<gt>p> must not be B<NULL>. +DH_bits() returns the number of significant bits. + +B<dh> and B<dh-E<gt>p> must not be B<NULL>. =head1 RETURN VALUE -The size in bytes. +The size. =head1 SEE ALSO -L<dh(3)|dh(3)>, L<DH_generate_key(3)|DH_generate_key(3)> +L<dh(3)|dh(3)>, L<DH_generate_key(3)|DH_generate_key(3)>, +L<BN_num_bits(3)|BN_num_bits(3)> =head1 HISTORY DH_size() is available in all versions of SSLeay and OpenSSL. +DH_bits() was added in OpenSSL 1.1.0. =cut diff --git a/doc/crypto/RSA_size.pod b/doc/crypto/RSA_size.pod index 5b7f835f95..f68d5e8e3c 100644 --- a/doc/crypto/RSA_size.pod +++ b/doc/crypto/RSA_size.pod @@ -2,32 +2,37 @@ =head1 NAME -RSA_size - get RSA modulus size +RSA_size, RSA_bits - get RSA modulus size =head1 SYNOPSIS - #include <openssl/rsa.h> +#include <openssl/rsa.h> - int RSA_size(const RSA *rsa); +int RSA_size(const RSA *rsa); + +int RSA_bits(const RSA *rsa); =head1 DESCRIPTION -This function returns the RSA modulus size in bytes. It can be used to +RSA_size() returns the RSA modulus size in bytes. It can be used to determine how much memory must be allocated for an RSA encrypted value. -B<rsa-E<gt>n> must not be B<NULL>. +RSA_bits() returns the number of significant bits. + +B<rsa> and B<rsa-E<gt>n> must not be B<NULL>. =head1 RETURN VALUE -The size in bytes. +The size. =head1 SEE ALSO -L<rsa(3)|rsa(3)> +L<rsa(3)|rsa(3)>, L<BN_num_bits(3)|BN_num_bits(3)> =head1 HISTORY RSA_size() is available in all versions of SSLeay and OpenSSL. +RSA_bits() was added in OpenSSL 1.1.0. =cut diff --git a/doc/crypto/dh.pod b/doc/crypto/dh.pod index c3ccd06207..1c8a327458 100644 --- a/doc/crypto/dh.pod +++ b/doc/crypto/dh.pod @@ -12,8 +12,6 @@ dh - Diffie-Hellman key agreement DH * DH_new(void); void DH_free(DH *dh); - int DH_size(const DH *dh); - DH * DH_generate_parameters(int prime_len, int generator, void (*callback)(int, int, void *), void *cb_arg); int DH_check(const DH *dh, int *codes); diff --git a/doc/crypto/rsa.pod b/doc/crypto/rsa.pod index 45ac53ffc1..743334ff79 100644 --- a/doc/crypto/rsa.pod +++ b/doc/crypto/rsa.pod @@ -26,8 +26,6 @@ rsa - RSA public key cryptosystem int RSA_verify(int type, unsigned char *m, unsigned int m_len, unsigned char *sigbuf, unsigned int siglen, RSA *rsa); - int RSA_size(const RSA *rsa); - RSA *RSA_generate_key(int num, unsigned long e, void (*callback)(int,int,void *), void *cb_arg); |