diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-07-17 13:10:14 +0200 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-07-17 07:10:14 -0400 |
| commit | a2173583d928cc95977f8dbbb7dd48cc732b24f5 (patch) | |
| tree | 7a393eb2319936e2402976499213a9eb13c53b20 /src/cryptography/hazmat/backends/openssl/aead.py | |
| parent | 165743ee63d05b343bf7e6b6b0afe0c23be71ca2 (diff) | |
| download | cryptography-a2173583d928cc95977f8dbbb7dd48cc732b24f5.tar.gz cryptography-a2173583d928cc95977f8dbbb7dd48cc732b24f5.tar.bz2 cryptography-a2173583d928cc95977f8dbbb7dd48cc732b24f5.zip | |
add AESGCM AEAD support (#3785)
* add AESGCM AEAD support
* remove stray newline
* move AESGCM docs above CCM
Diffstat (limited to 'src/cryptography/hazmat/backends/openssl/aead.py')
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/aead.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/aead.py b/src/cryptography/hazmat/backends/openssl/aead.py index 5402acb3..9cec3e23 100644 --- a/src/cryptography/hazmat/backends/openssl/aead.py +++ b/src/cryptography/hazmat/backends/openssl/aead.py @@ -13,13 +13,15 @@ _DECRYPT = 0 def _aead_cipher_name(cipher): from cryptography.hazmat.primitives.ciphers.aead import ( - AESCCM, ChaCha20Poly1305 + AESCCM, AESGCM, ChaCha20Poly1305 ) if isinstance(cipher, ChaCha20Poly1305): return b"chacha20-poly1305" - else: - assert isinstance(cipher, AESCCM) + elif isinstance(cipher, AESCCM): return "aes-{0}-ccm".format(len(cipher._key) * 8).encode("ascii") + else: + assert isinstance(cipher, AESGCM) + return "aes-{0}-gcm".format(len(cipher._key) * 8).encode("ascii") def _aead_setup(backend, cipher_name, key, nonce, tag, tag_len, operation): |