commit 50150573bd1d6f05e818cc3706cfba3fe9ed490a
author thaidn <thaidn@google.com> Thu Apr 30 16:04:57 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Apr 30 16:05:38 2020 -0700
tree e736f413ce7a287c2d0d084c051a637b52b4bb8a
parent e3c5fd04a3eeb3a8e4a415bdd519f8937ae35034

Fixing a typo in KMS Envelope AEAD.

Updating list of primitives supported in each language.

PiperOrigin-RevId: 309317968

docs/PRIMITIVES.md

diff --git a/docs/PRIMITIVES.md b/docs/PRIMITIVES.md
index ba0ea91..13a1b82 100644
--- a/docs/PRIMITIVES.md
+++ b/docs/PRIMITIVES.md
@@ -26,16 +26,16 @@
 
 ### Primitives supported by language
 
-**Primitive**      | **Java** | **C++** | **ObjC** | **Go**
------------------- | -------- | ------- | -------- | ------
-AEAD               | yes      | yes     | yes      | yes
-Streaming AEAD     | yes      | yes     | no       | no
-Deterministic AEAD | yes      | yes     | yes      | yes
-MAC                | yes      | yes     | yes      | yes
-Digital signatures | yes      | yes     | yes      | yes
-Hybrid encryption  | yes      | yes     | yes      | yes
+**Primitive**      | **Java** | **C++** | **ObjC** | **Go** | **Python**
+------------------ | -------- | ------- | -------- | ------ | ----------
+AEAD               | yes      | yes     | yes      | yes    | yes
+Streaming AEAD     | yes      | yes     | no       | yes    | no
+Deterministic AEAD | yes      | yes     | yes      | yes    | yes
+MAC                | yes      | yes     | yes      | yes    | yes
+Digital signatures | yes      | yes     | yes      | yes    | yes
+Hybrid encryption  | yes      | yes     | yes      | yes    | yes
 
-JavaScript and Python are currently under development.
+JavaScript is currently under development.
 
 ### Primitive implementations supported by languege
 
@@ -54,7 +54,7 @@
 
 Primitive          | C++ Implementations
 ------------------ | -----------------------------------------------------------------------------
-AEAD               | AES-GCM, AES-GCM-SIV, AES-CTR-HMAC, AES-EAX, KMS Envelope, XCHACHA20-POLY1305
+AEAD               | AES-GCM, AES-GCM-SIV, AES-CTR-HMAC, AES-EAX, KMS Envelope, CHACHA20-POLY1305, XCHACHA20-POLY1305
 Streaming AEAD     | AES-GCM-HKDF-STREAMING, AES-CTR-HMAC-STREAMING
 Deterministic AEAD | AES-SIV
 MAC                | HMAC-SHA2, AES-CMAC
@@ -76,11 +76,22 @@
 Primitive          | Go Implementations
 ------------------ | ------------------------------------------------------------------------
 AEAD               | AES-GCM, AES-CTR-HMAC, KMS Envelope, CHACHA20-POLY1305, XCHACHA-POLY1305
+Streaming AEAD     | AES-GCM-HKDF-STREAMING
 Deterministic AEAD | AES-SIV
 MAC                | HMAC-SHA2, AES-CMAC
 Digital Signatures | ECDSA over NIST curves, Ed25519
 Hybrid Encryption  | ECIES with AEAD and HKDF
 
+#### Python
+
+Primitive          | Python Implementations
+------------------ | -----------------------------------------------------------------------------
+AEAD               | AES-GCM, AES-CTR-HMAC, AES-EAX, KMS Envelope, CHACHA20-POLY1305, XCHACHA20-POLY1305
+Deterministic AEAD | AES-SIV
+MAC                | HMAC-SHA2
+Digital Signatures | ECDSA over NIST curves, Ed25519, RSA-SSA-PKCS1, RSA-SSA-PSS
+Hybrid Encryption  | ECIES with AEAD and HKDF
+
 ---
 
 ## General properties of all primitives

python/tink/aead/_kms_envelope_aead.py

diff --git a/python/tink/aead/_kms_envelope_aead.py b/python/tink/aead/_kms_envelope_aead.py
index 1573aa1..b22d513 100644
--- a/python/tink/aead/_kms_envelope_aead.py
+++ b/python/tink/aead/_kms_envelope_aead.py
@@ -85,7 +85,7 @@
     dek = tink_pb2.KeyData()
     dek.type_url = self.key_template.type_url
     dek.value = dek_bytes
-    dek.key_material_type = tink_pb2.KeyData.KeyMaterialType.SYMMETRIC
+    dek.key_material_type = tink_pb2.KeyData.SYMMETRIC
     dek_aead = core.Registry.primitive(dek, _aead.Aead)
 
     # Extract ciphertext payload and decrypt