Skip to content
This repository was archived by the owner on Apr 17, 2024. It is now read-only.

Commit 5015057

Browse files
thaidncopybara-github
authored andcommitted
Fixing a typo in KMS Envelope AEAD.
Updating list of primitives supported in each language. PiperOrigin-RevId: 309317968
1 parent e3c5fd0 commit 5015057

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

docs/PRIMITIVES.md

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ describe the main properties of Tink primitives.
2626

2727
### Primitives supported by language
2828

29-
**Primitive** | **Java** | **C++** | **ObjC** | **Go**
30-
------------------ | -------- | ------- | -------- | ------
31-
AEAD | yes | yes | yes | yes
32-
Streaming AEAD | yes | yes | no | no
33-
Deterministic AEAD | yes | yes | yes | yes
34-
MAC | yes | yes | yes | yes
35-
Digital signatures | yes | yes | yes | yes
36-
Hybrid encryption | yes | yes | yes | yes
29+
**Primitive** | **Java** | **C++** | **ObjC** | **Go** | **Python**
30+
------------------ | -------- | ------- | -------- | ------ | ----------
31+
AEAD | yes | yes | yes | yes | yes
32+
Streaming AEAD | yes | yes | no | yes | no
33+
Deterministic AEAD | yes | yes | yes | yes | yes
34+
MAC | yes | yes | yes | yes | yes
35+
Digital signatures | yes | yes | yes | yes | yes
36+
Hybrid encryption | yes | yes | yes | yes | yes
3737

38-
JavaScript and Python are currently under development.
38+
JavaScript is currently under development.
3939

4040
### Primitive implementations supported by languege
4141

@@ -54,7 +54,7 @@ Hybrid Encryption | ECIES with AEAD and HKDF
5454

5555
Primitive | C++ Implementations
5656
------------------ | -----------------------------------------------------------------------------
57-
AEAD | AES-GCM, AES-GCM-SIV, AES-CTR-HMAC, AES-EAX, KMS Envelope, XCHACHA20-POLY1305
57+
AEAD | AES-GCM, AES-GCM-SIV, AES-CTR-HMAC, AES-EAX, KMS Envelope, CHACHA20-POLY1305, XCHACHA20-POLY1305
5858
Streaming AEAD | AES-GCM-HKDF-STREAMING, AES-CTR-HMAC-STREAMING
5959
Deterministic AEAD | AES-SIV
6060
MAC | HMAC-SHA2, AES-CMAC
@@ -76,11 +76,22 @@ Hybrid Encryption | ECIES with AEAD and HKDF
7676
Primitive | Go Implementations
7777
------------------ | ------------------------------------------------------------------------
7878
AEAD | AES-GCM, AES-CTR-HMAC, KMS Envelope, CHACHA20-POLY1305, XCHACHA-POLY1305
79+
Streaming AEAD | AES-GCM-HKDF-STREAMING
7980
Deterministic AEAD | AES-SIV
8081
MAC | HMAC-SHA2, AES-CMAC
8182
Digital Signatures | ECDSA over NIST curves, Ed25519
8283
Hybrid Encryption | ECIES with AEAD and HKDF
8384

85+
#### Python
86+
87+
Primitive | Python Implementations
88+
------------------ | -----------------------------------------------------------------------------
89+
AEAD | AES-GCM, AES-CTR-HMAC, AES-EAX, KMS Envelope, CHACHA20-POLY1305, XCHACHA20-POLY1305
90+
Deterministic AEAD | AES-SIV
91+
MAC | HMAC-SHA2
92+
Digital Signatures | ECDSA over NIST curves, Ed25519, RSA-SSA-PKCS1, RSA-SSA-PSS
93+
Hybrid Encryption | ECIES with AEAD and HKDF
94+
8495
---
8596

8697
## General properties of all primitives

python/tink/aead/_kms_envelope_aead.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def decrypt(self, ciphertext: bytes, associated_data: bytes) -> bytes:
8585
dek = tink_pb2.KeyData()
8686
dek.type_url = self.key_template.type_url
8787
dek.value = dek_bytes
88-
dek.key_material_type = tink_pb2.KeyData.KeyMaterialType.SYMMETRIC
88+
dek.key_material_type = tink_pb2.KeyData.SYMMETRIC
8989
dek_aead = core.Registry.primitive(dek, _aead.Aead)
9090

9191
# Extract ciphertext payload and decrypt

0 commit comments

Comments
 (0)