Update roadmap document.

PiperOrigin-RevId: 281357898

Author: chuckx

docs/ROADMAP.md

@@ -1,73 +1,57 @@
 # Tink Feature Roadmap
 
-(_based on Bazel Feature Roadmap_)
+This document describes the Tink team's plans for introducing features.
 
-This document describes the Tink team's plans for introducing features. Note
-that this roadmap only includes features that the Tink team itself intends to
-support. We anticipate that a number of other features will be added by code
-contributors.
+This roadmap only includes features that the Tink team itself intends to
+implement. Other features may be added by code contributors.
 
-In the following list, each feature is associated with a corresponding
-milestone. The convention for the priorities are:
+In the following list, features are bundled together by milestone and and then
+by the language implementation they're associated with.
 
-*   **P0** feature will block the milestone; we will delay the milestone date
-    until the feature is shipped.
+Each feature is prefixed with a priority level. The defintion of the priority
+levels are are:
 
-*   **P1** feature can delay the milestone if the feature can be shipped with a
-    reasonable delay.
+*   **P0**:  The feature will block the milestone. We will delay the milestone
+    date until the feature is shipped.
 
-*   **P2** feature will be dropped and rescheduled for later rather than
-    delaying the milestone. We will update this list when reaching each
-    milestone; some milestones may also be refined if appropriate.
+*   **P1**: The feature can delay the milestone if the feature can be shipped
+    with a reasonable delay.
 
-## Planned feature list
+*   **P2**:  The feature will be dropped and rescheduled for later rather than
+    delaying the milestone.
 
-### 1.2.0
-
-Tentative release date: July 2018 (it was June 2018, but we need more time to
-prepare the Obj-C release).
+This list will be updated periodically and milestones may be refined if
+appropriate.
 
-*   Java
-
-    *   P1. Hybrid encryption with X25519 and ChaCha20Poly1305.
-
-*   C++
-
-    *   P0. Initial release, feature parity with [Java
-        1.0.0](https://github.com/google/tink/releases/tag/v1.0.0).
-    *   P0. Easy installation.
-    *   P1. Integration with Google Cloud KMS and AWS KMS.
-
-*   Objective-C
-
-    *   P0. Initial release, feature parity with [Java
-        1.0.0](https://github.com/google/tink/releases/tag/v1.0.0).
-    *   P0. Easy installation.
-    *   P1. Integration with iOS Keychain.
+## Upcoming milestones
 
 ### 1.3.0
 
-Tentative release date: February 2019.
+Tentative release date: November 2019.
 
 Tentative new features:
 
 *   Java
 
-    *   P0. Integration with Cloud KMS/AWS KMS: streaming envelope encryption
     *   P1. AEAD: XCHACHA20-POLY1305
     *   P1. Signature: RSA-SSA-PKCS1, RSA-PSS
-    *   P2. Streaming hybrid encryption
 
-*   C++/Obj-C
+*   C++
 
-    *   P0. Integration with Cloud KMS/AWS KMS: key storage and (streaming)
-        envelope encryption
+    *   P0. Integration with Cloud KMS/AWS KMS: key storage and envelope
+        encryption
     *   P0. Streaming AEAD: AES-GCM-HKDF-STREAMING, AES-CTR-HMAC-STREAMING
+    *   P0. Deterministic AEAD: AES-SIV
+    *   P0. Digital signature: ED25519
+    *   P1. AEAD: XCHACHA20-POLY1305, AES-GCM-SIV
+    *   P1. Signature: RSA-SSA-PKCS1, RSA-PSS
+
+*   Objective-C
+
     *   P0. Deterministic AEAD: AES-SIV
     *   P0. Digital signature: ED25519
     *   P1. AEAD: XCHACHA20-POLY1305
     *   P1. Signature: RSA-SSA-PKCS1, RSA-PSS
-    *   P2. Nonce reuse resistant AEAD: AES-GCM-SIV
 
 *   Go
 
@@ -83,17 +67,48 @@ Tentative new features:
 
 ### 1.4.0
 
-Tentative release date: August 2019.
+Tentative release date: February 2019.
 
 Tentative new features:
 
-*   Go/Java/C++/Obj-C
+*   Java
+
+    *   P0. AEAD: AES-GCM-SIV
+    *   P1. Integration with Cloud KMS/AWS KMS: streaming envelope encryption
+    *   P1. Full integration with Cloud KMS/AWS KMS: key storage, (streaming)
+        envelope encryption, hybrid encryption and digital signature
+    *   P1. Initial support for Cloud HSM/AWS HSM
+    *   P2. Nonce reuse resistant AEAD: AES-GCM-SIV
 
-    *   P0. Benchmarking
-    *   P0. Full integration with Cloud KMS/AWS KMS: key storage, (streaming)
+
+*   C++
+
+    *   P1. Integration with Cloud KMS/AWS KMS: streaming envelope encryption
+    *   P1. Full integration with Cloud KMS/AWS KMS: key storage, (streaming)
         envelope encryption, hybrid encryption and digital signature
-    *   P0. Initial support for Cloud HSM/AWS HSM
-    *   P1. Feature parity across platforms.
+    *   P1. Initial support for Cloud HSM/AWS HSM
+    *   P1. Feature parity across implementations
+    *   P2. Nonce reuse resistant AEAD: AES-GCM-SIV
+
+*   Objective-C
+
+    *   P0. Streaming AEAD: AES-GCM-HKDF-STREAMING, AES-CTR-HMAC-STREAMING
+    *   P1. AEAD: AES-GCM-SIV
+    *   P1. Feature parity across implementations
+    *   P2. Nonce reuse resistant AEAD: AES-GCM-SIV
+
+
+*   Go
+
+    *   P0. Streaming AEAD: AES-GCM-HKDF-STREAMING, AES-CTR-HMAC-STREAMING
+    *   P1. AEAD: AES-GCM-SIV
+    *   P1. Full integration with Cloud KMS/AWS KMS: key storage, (streaming)
+        envelope encryption, hybrid encryption and digital signature
+    *   P1. Initial support for Cloud HSM/AWS HSM
+    *   P1. Feature parity across implementations
+    *   P2. Nonce reuse resistant AEAD: AES-GCM-SIV
+
+
 
 *   JavaScript
 
@@ -102,3 +117,29 @@ Tentative new features:
 *   Python
 
     *   P0. Initial CLIF-based release that can replace Keyczar.
+
+## Past Milestones
+
+### 1.2.0
+
+Release date: August 2018
+
+[Release Notes](https://github.com/google/tink/releases/tag/v1.2.0)
+
+*   Java
+
+    *   P1. Hybrid encryption with X25519 and ChaCha20Poly1305.
+
+*   C++
+
+    *   P0. Initial release, feature parity with
+        [Java 1.0.0](https://github.com/google/tink/releases/tag/v1.0.0).
+    *   P0. Easy installation.
+    *   P1. Integration with Google Cloud KMS and AWS KMS.
+
+*   Objective-C
+
+    *   P0. Initial release, feature parity with
+        [Java 1.0.0](https://github.com/google/tink/releases/tag/v1.0.0).
+    *   P0. Easy installation.
+    *   P1. Integration with iOS Keychain.