diff options
author | David von Oheimb <David.von.Oheimb@siemens.com> | 2018-05-10 21:14:12 +0200 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2018-06-18 10:45:35 +0100 |
commit | 49c9c1b3d05782fe76bef2eef8c5224baf843240 (patch) | |
tree | b46b18ca01a027ae1960e6986c408134394538aa /doc | |
parent | f2950a46a6217110a7f77b5acfe558a6fb4dfeeb (diff) |
add 'unsupported cipher mode' diagnostics to evp_lib.c and genpkey.c
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6217)
Diffstat (limited to 'doc')
-rw-r--r-- | doc/man3/EVP_EncryptInit.pod | 2 | ||||
-rw-r--r-- | doc/man3/PKCS12_create.pod | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/man3/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod index 2e3a45a799..5fdbc33ac1 100644 --- a/doc/man3/EVP_EncryptInit.pod +++ b/doc/man3/EVP_EncryptInit.pod @@ -316,7 +316,7 @@ OBJECT IDENTIFIER or NID_undef if it has no defined OBJECT IDENTIFIER. EVP_CIPHER_CTX_cipher() returns an B<EVP_CIPHER> structure. EVP_CIPHER_param_to_asn1() and EVP_CIPHER_asn1_to_param() return greater -than zero for success and zero or a negative number. +than zero for success and zero or a negative number on failure. EVP_CIPHER_CTX_rand_key() returns 1 for success. diff --git a/doc/man3/PKCS12_create.pod b/doc/man3/PKCS12_create.pod index 0dcd2ab2a2..1587ea53e3 100644 --- a/doc/man3/PKCS12_create.pod +++ b/doc/man3/PKCS12_create.pod @@ -22,7 +22,8 @@ the structure and B<cert> its corresponding certificates. B<ca>, if not B<NULL> is an optional set of certificates to also include in the structure. B<nid_key> and B<nid_cert> are the encryption algorithms that should be used -for the key and certificate respectively. B<iter> is the encryption algorithm +for the key and certificate respectively. The modes +GCM, CCM, XTS, and OCB are unsupported. B<iter> is the encryption algorithm iteration count to use and B<mac_iter> is the MAC iteration count to use. B<keytype> is the type of key. |