diff --git a/README.md b/README.md index c23eecff97c6dcc925526f21b4f309e410038c40..f012b4b1049a40010871bbb88eef645d2a8ccd4b 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ AEAD primitive in Java: * [Tink for C++](docs/CPP-HOWTO.md) and [Tink for Obj-C](docs/OBJC-HOWTO.md) are catching up with [Tink for Java](docs/JAVA-HOWTO.md) in terms of features and stability, and the offered functionality is 100%-compatible - with Java (cf. [cross-language tests](tools/testing/cross_language/). We + with Java (cf. [cross-language tests](tools/testing/cross_language/)). We plan to make a first release in June 2018. * Tink for Go is in active development. diff --git a/docs/CPP-HOWTO.md b/docs/CPP-HOWTO.md index 4c97064129f1b1d887c924f958d8ac94adf93562..4f66e8d753bd2609c8156005483600e15c93cf35 100644 --- a/docs/CPP-HOWTO.md +++ b/docs/CPP-HOWTO.md @@ -170,9 +170,9 @@ directly in C++ code, one can use [`KeysetHandle`](https://github.com/google/tink/blob/master/cc/keyset_handle.h): ```cpp - auto new_keyset_result = KeysetHandle::GenerateNew(key_template); - if (!new_keyset_result.ok()) return new_key_result.status(); - auto keyset = std::move(new_keyset_result.ValueOrDie()); + auto new_keyset_handle_result = KeysetHandle::GenerateNew(key_template); + if (!new_keyset_handle_result.ok()) return new_keyset_handle_result.status(); + auto keyset_handle = std::move(new_keyset_handle_result.ValueOrDie()); // use the keyset... ``` @@ -248,7 +248,7 @@ factory offers corresponding `getPrimitive(...)` methods. Here is how you can obtain and use an [AEAD (Authenticated Encryption with Associated -Data](PRIMITIVES.md#authenticated-encryption-with-associated-data) primitive +Data)](PRIMITIVES.md#authenticated-encryption-with-associated-data) primitive to encrypt or decrypt data: ```cpp diff --git a/docs/PRIMITIVES.md b/docs/PRIMITIVES.md index d5ae6241febe47a0b668ed140587ba76e190e247..75ce75f7583d3f7623648c3bf4424e19207f36ed 100644 --- a/docs/PRIMITIVES.md +++ b/docs/PRIMITIVES.md @@ -63,7 +63,7 @@ Vizár](https://eprint.iacr.org/2015/189.pdf). Minimal properties: -- _plaintext_ and can have arbitrary length within the range 0..2<sup>38</sup> +- _plaintext_ can have arbitrary length within the range 0..2<sup>38</sup> and _associated data_ can have arbitrary length within the range 0..2<sup>31</sup>-1 bytes - CCA2 security