diff options
Diffstat (limited to 'src/lib/libcrypto/man')
| -rw-r--r-- | src/lib/libcrypto/man/EVP_AEAD_CTX_init.3 | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/lib/libcrypto/man/EVP_AEAD_CTX_init.3 b/src/lib/libcrypto/man/EVP_AEAD_CTX_init.3 index ff24d3bf10..debcc773c4 100644 --- a/src/lib/libcrypto/man/EVP_AEAD_CTX_init.3 +++ b/src/lib/libcrypto/man/EVP_AEAD_CTX_init.3 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | .\" $OpenBSD: EVP_AEAD_CTX_init.3,v 1.5 2016/11/21 22:19:15 jmc Exp $ | 1 | .\" $OpenBSD: EVP_AEAD_CTX_init.3,v 1.6 2017/08/28 17:43:43 jsing Exp $ |
| 2 | .\" | 2 | .\" |
| 3 | .\" Copyright (c) 2014, Google Inc. | 3 | .\" Copyright (c) 2014, Google Inc. |
| 4 | .\" Parts of the text were written by Adam Langley and David Benjamin. | 4 | .\" Parts of the text were written by Adam Langley and David Benjamin. |
| @@ -16,7 +16,7 @@ | |||
| 16 | .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | 16 | .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
| 17 | .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 17 | .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 18 | .\" | 18 | .\" |
| 19 | .Dd $Mdocdate: November 21 2016 $ | 19 | .Dd $Mdocdate: August 28 2017 $ |
| 20 | .Dt EVP_AEAD_CTX_INIT 3 | 20 | .Dt EVP_AEAD_CTX_INIT 3 |
| 21 | .Os | 21 | .Os |
| 22 | .Sh NAME | 22 | .Sh NAME |
| @@ -30,8 +30,7 @@ | |||
| 30 | .Nm EVP_AEAD_nonce_length , | 30 | .Nm EVP_AEAD_nonce_length , |
| 31 | .Nm EVP_aead_aes_128_gcm , | 31 | .Nm EVP_aead_aes_128_gcm , |
| 32 | .Nm EVP_aead_aes_256_gcm , | 32 | .Nm EVP_aead_aes_256_gcm , |
| 33 | .Nm EVP_aead_chacha20_poly1305 , | 33 | .Nm EVP_aead_chacha20_poly1305 |
| 34 | .Nm EVP_aead_chacha20_poly1305_ietf | ||
| 35 | .Nd authenticated encryption with additional data | 34 | .Nd authenticated encryption with additional data |
| 36 | .Sh SYNOPSIS | 35 | .Sh SYNOPSIS |
| 37 | .In openssl/evp.h | 36 | .In openssl/evp.h |
| @@ -102,10 +101,6 @@ | |||
| 102 | .Fo EVP_aead_chacha20_poly1305 | 101 | .Fo EVP_aead_chacha20_poly1305 |
| 103 | .Fa void | 102 | .Fa void |
| 104 | .Fc | 103 | .Fc |
| 105 | .Ft const EVP_AEAD * | ||
| 106 | .Fo EVP_aead_chacha20_poly1305_ietf | ||
| 107 | .Fa void | ||
| 108 | .Fc | ||
| 109 | .Sh DESCRIPTION | 104 | .Sh DESCRIPTION |
| 110 | AEAD (Authenticated Encryption with Additional Data) couples | 105 | AEAD (Authenticated Encryption with Additional Data) couples |
| 111 | confidentiality and integrity in a single primitive. | 106 | confidentiality and integrity in a single primitive. |
| @@ -224,11 +219,6 @@ AES-128 in Galois Counter Mode. | |||
| 224 | AES-256 in Galois Counter Mode. | 219 | AES-256 in Galois Counter Mode. |
| 225 | .It Fn EVP_aead_chacha20_poly1305 | 220 | .It Fn EVP_aead_chacha20_poly1305 |
| 226 | ChaCha20 with a Poly1305 authenticator. | 221 | ChaCha20 with a Poly1305 authenticator. |
| 227 | .It Fn EVP_aead_chacha20_poly1305_ietf | ||
| 228 | ChaCha20 with a Poly1305 authenticator for IETF Protocols. | ||
| 229 | The IETF standardised variant of the AEAD is incompatible with the | ||
| 230 | original version. | ||
| 231 | It uses a constant salt that is prepended to the nonce. | ||
| 232 | .El | 222 | .El |
| 233 | .Pp | 223 | .Pp |
| 234 | Where possible the | 224 | Where possible the |
