tink-HEAD-SNAPSHOT Javadoc auto-pushed to gh-pages
diff --git a/javadoc/tink/HEAD-SNAPSHOT/allclasses-frame.html b/javadoc/tink/HEAD-SNAPSHOT/allclasses-frame.html
index 1333fcb..b1f1c7e 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/allclasses-frame.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/allclasses-frame.html
@@ -79,13 +79,18 @@
 <li><a href="com/google/crypto/tink/proto/AesCtrParamsOrBuilder.html" title="interface in com.google.crypto.tink.proto" target="classFrame"><span class="interfaceName">AesCtrParamsOrBuilder</span></a></li>
 <li><a href="com/google/crypto/tink/proto/AesEax.html" title="class in com.google.crypto.tink.proto" target="classFrame">AesEax</a></li>
 <li><a href="com/google/crypto/tink/subtle/AesEaxJce.html" title="class in com.google.crypto.tink.subtle" target="classFrame">AesEaxJce</a></li>
+<li><a href="com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxKey</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKey.html" title="class in com.google.crypto.tink.proto" target="classFrame">AesEaxKey</a></li>
+<li><a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxKey.Builder</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.proto" target="classFrame">AesEaxKey.Builder</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKeyFormat.html" title="class in com.google.crypto.tink.proto" target="classFrame">AesEaxKeyFormat</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKeyFormat.Builder.html" title="class in com.google.crypto.tink.proto" target="classFrame">AesEaxKeyFormat.Builder</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKeyFormatOrBuilder.html" title="interface in com.google.crypto.tink.proto" target="classFrame"><span class="interfaceName">AesEaxKeyFormatOrBuilder</span></a></li>
 <li><a href="com/google/crypto/tink/aead/AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxKeyManager</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKeyOrBuilder.html" title="interface in com.google.crypto.tink.proto" target="classFrame"><span class="interfaceName">AesEaxKeyOrBuilder</span></a></li>
+<li><a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxParameters</a></li>
+<li><a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxParameters.Builder</a></li>
+<li><a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxParameters.Variant</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxParams.html" title="class in com.google.crypto.tink.proto" target="classFrame">AesEaxParams</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxParams.Builder.html" title="class in com.google.crypto.tink.proto" target="classFrame">AesEaxParams.Builder</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxParamsOrBuilder.html" title="interface in com.google.crypto.tink.proto" target="classFrame"><span class="interfaceName">AesEaxParamsOrBuilder</span></a></li>
@@ -132,6 +137,7 @@
 <li><a href="com/google/crypto/tink/mac/internal/AesUtil.html" title="class in com.google.crypto.tink.mac.internal" target="classFrame">AesUtil</a></li>
 <li><a href="com/google/crypto/tink/annotations/Alpha.html" title="annotation in com.google.crypto.tink.annotations" target="classFrame">Alpha</a></li>
 <li><a href="com/google/crypto/tink/subtle/Base64.html" title="class in com.google.crypto.tink.subtle" target="classFrame">Base64</a></li>
+<li><a href="com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal" target="classFrame">BigIntegerEncoding</a></li>
 <li><a href="com/google/crypto/tink/BinaryKeysetReader.html" title="class in com.google.crypto.tink" target="classFrame">BinaryKeysetReader</a></li>
 <li><a href="com/google/crypto/tink/BinaryKeysetWriter.html" title="class in com.google.crypto.tink" target="classFrame">BinaryKeysetWriter</a></li>
 <li><a href="com/google/crypto/tink/subtle/Bytes.html" title="class in com.google.crypto.tink.subtle" target="classFrame">Bytes</a></li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/allclasses-noframe.html b/javadoc/tink/HEAD-SNAPSHOT/allclasses-noframe.html
index 3e9340b..3e13d4b 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/allclasses-noframe.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/allclasses-noframe.html
@@ -79,13 +79,18 @@
 <li><a href="com/google/crypto/tink/proto/AesCtrParamsOrBuilder.html" title="interface in com.google.crypto.tink.proto"><span class="interfaceName">AesCtrParamsOrBuilder</span></a></li>
 <li><a href="com/google/crypto/tink/proto/AesEax.html" title="class in com.google.crypto.tink.proto">AesEax</a></li>
 <li><a href="com/google/crypto/tink/subtle/AesEaxJce.html" title="class in com.google.crypto.tink.subtle">AesEaxJce</a></li>
+<li><a href="com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKey.html" title="class in com.google.crypto.tink.proto">AesEaxKey</a></li>
+<li><a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.proto">AesEaxKey.Builder</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKeyFormat.html" title="class in com.google.crypto.tink.proto">AesEaxKeyFormat</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKeyFormat.Builder.html" title="class in com.google.crypto.tink.proto">AesEaxKeyFormat.Builder</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKeyFormatOrBuilder.html" title="interface in com.google.crypto.tink.proto"><span class="interfaceName">AesEaxKeyFormatOrBuilder</span></a></li>
 <li><a href="com/google/crypto/tink/aead/AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead">AesEaxKeyManager</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxKeyOrBuilder.html" title="interface in com.google.crypto.tink.proto"><span class="interfaceName">AesEaxKeyOrBuilder</span></a></li>
+<li><a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></li>
+<li><a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></li>
+<li><a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxParams.html" title="class in com.google.crypto.tink.proto">AesEaxParams</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxParams.Builder.html" title="class in com.google.crypto.tink.proto">AesEaxParams.Builder</a></li>
 <li><a href="com/google/crypto/tink/proto/AesEaxParamsOrBuilder.html" title="interface in com.google.crypto.tink.proto"><span class="interfaceName">AesEaxParamsOrBuilder</span></a></li>
@@ -132,6 +137,7 @@
 <li><a href="com/google/crypto/tink/mac/internal/AesUtil.html" title="class in com.google.crypto.tink.mac.internal">AesUtil</a></li>
 <li><a href="com/google/crypto/tink/annotations/Alpha.html" title="annotation in com.google.crypto.tink.annotations">Alpha</a></li>
 <li><a href="com/google/crypto/tink/subtle/Base64.html" title="class in com.google.crypto.tink.subtle">Base64</a></li>
+<li><a href="com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal">BigIntegerEncoding</a></li>
 <li><a href="com/google/crypto/tink/BinaryKeysetReader.html" title="class in com.google.crypto.tink">BinaryKeysetReader</a></li>
 <li><a href="com/google/crypto/tink/BinaryKeysetWriter.html" title="class in com.google.crypto.tink">BinaryKeysetWriter</a></li>
 <li><a href="com/google/crypto/tink/subtle/Bytes.html" title="class in com.google.crypto.tink.subtle">Bytes</a></li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/SecretKeyAccess.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/SecretKeyAccess.html
index 915beaa..873d98b 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/SecretKeyAccess.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/SecretKeyAccess.html
@@ -152,7 +152,7 @@
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static <a href="../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink">SecretKeyAccess</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/crypto/tink/SecretKeyAccess.html#requireAccess-com.google.crypto.tink.SecretKeyAccess-">requireAccess</a></span>(<a href="../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink">SecretKeyAccess</a>&nbsp;access)</code>
-<div class="block">Throws an exception if the passed in SecretKeyAccess is null, otherwise returns it.</div>
+<div class="block">Throws an exception if the passed in <a href="../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> is null, otherwise returns it.</div>
 </td>
 </tr>
 </table>
@@ -187,7 +187,15 @@
 public static&nbsp;<a href="../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink">SecretKeyAccess</a>&nbsp;requireAccess(<a href="https://docs.oracle.com/javase/8/docs/api/javax/annotation/Nullable.html?is-external=true" title="class or interface in javax.annotation">@Nullable</a>
                                                                   <a href="../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink">SecretKeyAccess</a>&nbsp;access)
                                                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></pre>
-<div class="block">Throws an exception if the passed in SecretKeyAccess is null, otherwise returns it.</div>
+<div class="block">Throws an exception if the passed in <a href="../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> is null, otherwise returns it.
+
+ <p>Note: Tink has two types of APIs, some which take a nullable <code>SecretKeyAccess</code>, and
+ some which take a <code>SecretKeyAccess</code> without annotation. When an API takes a nullable
+ <code>SecretKeyAccess</code>, this indicates that proper usage may call it with <code>null</code>, hence
+ we typically want to throw a checked exception and <code>requireAccess</code> here is appropriate.
+ Conversely, if an API takes an unannotated <code>SecretKeyAccess</code>, this indicates that the API
+ always requires a non-null object. In this case, using it with null warrants should usually
+ throw a null pointer exception (and one does not want to use <code>requireAccess</code>).</div>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></code></dd>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AeadKey.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AeadKey.html
index 49f4691..196fb1a 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AeadKey.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AeadKey.html
@@ -111,6 +111,10 @@
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></dd>
+</dl>
 <hr>
 <br>
 <pre>public abstract class <span class="typeNameLabel">AeadKey</span>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AeadParameters.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AeadParameters.html
index d778323..5de051e 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AeadParameters.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AeadParameters.html
@@ -105,6 +105,10 @@
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dd>
+</dl>
 <hr>
 <br>
 <pre>@Immutable
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesCtrKeyManager.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesCtrKeyManager.html
index ae46446..fdff6b6 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesCtrKeyManager.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesCtrKeyManager.html
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../com/google/crypto/tink/aead/AesCtrHmacAeadKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesCtrKeyManager.html" target="_top">Frames</a></li>
@@ -362,7 +362,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../com/google/crypto/tink/aead/AesCtrHmacAeadKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesCtrKeyManager.html" target="_top">Frames</a></li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxKey.Builder.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxKey.Builder.html
new file mode 100644
index 0000000..33d84db
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxKey.Builder.html
@@ -0,0 +1,289 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>AesEaxKey.Builder</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AesEaxKey.Builder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AesEaxKey.Builder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxKey.Builder.html" target="_top">Frames</a></li>
+<li><a href="AesEaxKey.Builder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.google.crypto.tink.aead</div>
+<h2 title="Class AesEaxKey.Builder" class="title">Class AesEaxKey.Builder</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>com.google.crypto.tink.aead.AesEaxKey.Builder</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span class="typeNameLabel">AesEaxKey.Builder</span>
+extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<div class="block">Builder for AesEaxKey.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html#build--">build</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html#setIdRequirement-java.lang.Integer-">setIdRequirement</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&nbsp;idRequirement)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html#setKeyBytes-com.google.crypto.tink.util.SecretBytes-">setKeyBytes</a></span>(<a href="../../../../../com/google/crypto/tink/util/SecretBytes.html" title="class in com.google.crypto.tink.util">SecretBytes</a>&nbsp;keyBytes)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html#setParameters-com.google.crypto.tink.aead.AesEaxParameters-">setParameters</a></span>(<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a>&nbsp;parameters)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="setParameters-com.google.crypto.tink.aead.AesEaxParameters-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setParameters</h4>
+<pre>@CanIgnoreReturnValue
+public&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a>&nbsp;setParameters(<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a>&nbsp;parameters)</pre>
+</li>
+</ul>
+<a name="setKeyBytes-com.google.crypto.tink.util.SecretBytes-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setKeyBytes</h4>
+<pre>@CanIgnoreReturnValue
+public&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a>&nbsp;setKeyBytes(<a href="../../../../../com/google/crypto/tink/util/SecretBytes.html" title="class in com.google.crypto.tink.util">SecretBytes</a>&nbsp;keyBytes)</pre>
+</li>
+</ul>
+<a name="setIdRequirement-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setIdRequirement</h4>
+<pre>@CanIgnoreReturnValue
+public&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a>&nbsp;setIdRequirement(<a href="https://docs.oracle.com/javase/8/docs/api/javax/annotation/Nullable.html?is-external=true" title="class or interface in javax.annotation">@Nullable</a>
+                                                                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&nbsp;idRequirement)</pre>
+</li>
+</ul>
+<a name="build--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>build</h4>
+<pre>public&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a>&nbsp;build()
+                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AesEaxKey.Builder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxKey.Builder.html" target="_top">Frames</a></li>
+<li><a href="AesEaxKey.Builder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxKey.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxKey.html
new file mode 100644
index 0000000..5504603
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxKey.html
@@ -0,0 +1,392 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>AesEaxKey</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AesEaxKey";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AesEaxKey.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../com/google/crypto/tink/aead/AesCtrKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxKey.html" target="_top">Frames</a></li>
+<li><a href="AesEaxKey.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.google.crypto.tink.aead</div>
+<h2 title="Class AesEaxKey" class="title">Class AesEaxKey</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink">com.google.crypto.tink.Key</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead">com.google.crypto.tink.aead.AeadKey</a></li>
+<li>
+<ul class="inheritance">
+<li>com.google.crypto.tink.aead.AesEaxKey</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre><a href="../../../../../com/google/crypto/tink/annotations/Alpha.html" title="annotation in com.google.crypto.tink.annotations">@Alpha</a>
+ @Immutable
+public final class <span class="typeNameLabel">AesEaxKey</span>
+extends <a href="../../../../../com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead">AeadKey</a></pre>
+<div class="block">Represents an AES-EAX key used for computing AEAD.
+
+ <p>This API is annotated with Alpha because it is not yet stable and might be changed in the
+ future.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></span></code>
+<div class="block">Builder for AesEaxKey.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html#builder--">builder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html#equalsKey-com.google.crypto.tink.Key-">equalsKey</a></span>(<a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink">Key</a>&nbsp;o)</code>
+<div class="block">Returns true if the key is equal to the passed in key.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html#getIdRequirementOrNull--">getIdRequirementOrNull</a></span>()</code>
+<div class="block">Returns null if this key has no id requirement, otherwise the required id.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/util/SecretBytes.html" title="class in com.google.crypto.tink.util">SecretBytes</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html#getKeyBytes--">getKeyBytes</a></span>()</code>
+<div class="block">Returns the underlying key bytes.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/util/Bytes.html" title="class in com.google.crypto.tink.util">Bytes</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html#getOutputPrefix--">getOutputPrefix</a></span>()</code>
+<div class="block">Returns a <a href="../../../../../com/google/crypto/tink/util/Bytes.html" title="class in com.google.crypto.tink.util"><code>Bytes</code></a> instance which is prefixed to the ciphertext.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html#getParameters--">getParameters</a></span>()</code>
+<div class="block">Returns the parameters of this key.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="builder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>builder</h4>
+<pre>public static&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a>&nbsp;builder()</pre>
+</li>
+</ul>
+<a name="getKeyBytes--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getKeyBytes</h4>
+<pre>public&nbsp;<a href="../../../../../com/google/crypto/tink/util/SecretBytes.html" title="class in com.google.crypto.tink.util">SecretBytes</a>&nbsp;getKeyBytes()</pre>
+<div class="block">Returns the underlying key bytes.</div>
+</li>
+</ul>
+<a name="getOutputPrefix--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getOutputPrefix</h4>
+<pre>public&nbsp;<a href="../../../../../com/google/crypto/tink/util/Bytes.html" title="class in com.google.crypto.tink.util">Bytes</a>&nbsp;getOutputPrefix()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../com/google/crypto/tink/aead/AeadKey.html#getOutputPrefix--">AeadKey</a></code></span></div>
+<div class="block">Returns a <a href="../../../../../com/google/crypto/tink/util/Bytes.html" title="class in com.google.crypto.tink.util"><code>Bytes</code></a> instance which is prefixed to the ciphertext.
+
+ <p>In order to make key rotation more efficient, Tink allows every Aead key to be prefixed with
+ a sequence of bytes. When decrypting data, only keys with matching prefix have to be tried.
+
+ <p>Note that a priori, the output prefix may not be unique in a keyset (i.e., different keys in
+ a keyset may have the same prefix or, one prefix may be a prefix of the other). To avoid this,
+ built in Tink keys use the convention that the prefix is either '0x00<big endian key id>' or
+ '0x01<big endian key id>'. See the Tink keys for details.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../com/google/crypto/tink/aead/AeadKey.html#getOutputPrefix--">getOutputPrefix</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead">AeadKey</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getParameters--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getParameters</h4>
+<pre>public&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a>&nbsp;getParameters()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../com/google/crypto/tink/aead/AeadKey.html#getParameters--">AeadKey</a></code></span></div>
+<div class="block">Returns the parameters of this key.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../com/google/crypto/tink/aead/AeadKey.html#getParameters--">getParameters</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead">AeadKey</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getIdRequirementOrNull--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getIdRequirementOrNull</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/javax/annotation/Nullable.html?is-external=true" title="class or interface in javax.annotation">@Nullable</a>
+public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&nbsp;getIdRequirementOrNull()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../com/google/crypto/tink/Key.html#getIdRequirementOrNull--">Key</a></code></span></div>
+<div class="block">Returns null if this key has no id requirement, otherwise the required id.
+
+ <p>Some keys, when they are in a keyset, are required to have a certain ID to work properly.
+ This comes from the fact that Tink in some cases prefixes ciphertexts or signatures with the
+ string <code>0x01&lt;id&gt;</code>, where the ID is encoded in big endian (see the documentation of the
+ key type for details), in which case the key requires a certain ID.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../com/google/crypto/tink/Key.html#getIdRequirementOrNull--">getIdRequirementOrNull</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink">Key</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="equalsKey-com.google.crypto.tink.Key-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>equalsKey</h4>
+<pre>public&nbsp;boolean&nbsp;equalsKey(<a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink">Key</a>&nbsp;o)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../com/google/crypto/tink/Key.html#equalsKey-com.google.crypto.tink.Key-">Key</a></code></span></div>
+<div class="block">Returns true if the key is equal to the passed in key.
+
+ <p>Implementations are required to do this in constant time.
+
+ <p>Note: Tink <code>Key</code> objects should typically not override <code>hashCode</code> (because it
+ could risk leaking key material). Hence, they typically also should not override <code>equals</code>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../com/google/crypto/tink/Key.html#equalsKey-com.google.crypto.tink.Key-">equalsKey</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink">Key</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AesEaxKey.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../com/google/crypto/tink/aead/AesCtrKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxKey.html" target="_top">Frames</a></li>
+<li><a href="AesEaxKey.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxKeyManager.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxKeyManager.html
index 4dab9e2..f10fdd7 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxKeyManager.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxKeyManager.html
@@ -48,8 +48,8 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../com/google/crypto/tink/aead/AesCtrKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../com/google/crypto/tink/aead/AesGcmKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxKeyManager.html" target="_top">Frames</a></li>
@@ -477,8 +477,8 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../com/google/crypto/tink/aead/AesCtrKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../com/google/crypto/tink/aead/AesGcmKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxKeyManager.html" target="_top">Frames</a></li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxParameters.Builder.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxParameters.Builder.html
new file mode 100644
index 0000000..7229794
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxParameters.Builder.html
@@ -0,0 +1,329 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>AesEaxParameters.Builder</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AesEaxParameters.Builder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AesEaxParameters.Builder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxParameters.Builder.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.Builder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.google.crypto.tink.aead</div>
+<h2 title="Class AesEaxParameters.Builder" class="title">Class AesEaxParameters.Builder</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>com.google.crypto.tink.aead.AesEaxParameters.Builder</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static final class <span class="typeNameLabel">AesEaxParameters.Builder</span>
+extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<div class="block">Builds a new AesEaxParameters instance.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html#build--">build</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setIvSizeBytes-int-">setIvSizeBytes</a></span>(int&nbsp;ivSizeBytes)</code>
+<div class="block">IV size must be 12 or 16 bytes.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setKeySizeBytes-int-">setKeySizeBytes</a></span>(int&nbsp;keySizeBytes)</code>
+<div class="block">Accepts key sizes of 16, 24 or 32 bytes.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setTagSizeBytes-int-">setTagSizeBytes</a></span>(int&nbsp;tagSizeBytes)</code>
+<div class="block">The tag size accepts values between 0 and 16 bytes.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setVariant-com.google.crypto.tink.aead.AesEaxParameters.Variant-">setVariant</a></span>(<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a>&nbsp;variant)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="setKeySizeBytes-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setKeySizeBytes</h4>
+<pre>@CanIgnoreReturnValue
+public&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a>&nbsp;setKeySizeBytes(int&nbsp;keySizeBytes)
+                                                               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></pre>
+<div class="block">Accepts key sizes of 16, 24 or 32 bytes. However, some implementation may not support the
+ full set of parameters at the moment and may restrict the key size to 16 or 32-byte values.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="setIvSizeBytes-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setIvSizeBytes</h4>
+<pre>@CanIgnoreReturnValue
+public&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a>&nbsp;setIvSizeBytes(int&nbsp;ivSizeBytes)
+                                                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></pre>
+<div class="block">IV size must be 12 or 16 bytes.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="setTagSizeBytes-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setTagSizeBytes</h4>
+<pre>@CanIgnoreReturnValue
+public&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a>&nbsp;setTagSizeBytes(int&nbsp;tagSizeBytes)
+                                                               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></pre>
+<div class="block">The tag size accepts values between 0 and 16 bytes. However, some implementation may not
+ support the full set of parameters at the moment and may restrict the tag size to a fixed
+ value (i.e. 16 bytes).</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="setVariant-com.google.crypto.tink.aead.AesEaxParameters.Variant-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setVariant</h4>
+<pre>@CanIgnoreReturnValue
+public&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a>&nbsp;setVariant(<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a>&nbsp;variant)</pre>
+</li>
+</ul>
+<a name="build--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>build</h4>
+<pre>public&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a>&nbsp;build()
+                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AesEaxParameters.Builder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxParameters.Builder.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.Builder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxParameters.Variant.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxParameters.Variant.html
new file mode 100644
index 0000000..a99e73d
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxParameters.Variant.html
@@ -0,0 +1,311 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>AesEaxParameters.Variant</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AesEaxParameters.Variant";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AesEaxParameters.Variant.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesGcmKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxParameters.Variant.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.Variant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.google.crypto.tink.aead</div>
+<h2 title="Class AesEaxParameters.Variant" class="title">Class AesEaxParameters.Variant</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>com.google.crypto.tink.aead.AesEaxParameters.Variant</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dd>
+</dl>
+<hr>
+<br>
+<pre>@Immutable
+public static final class <span class="typeNameLabel">AesEaxParameters.Variant</span>
+extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<div class="block">Describes how the prefix is computed. For AEAD there are three main possibilities: NO_PREFIX
+ (empty prefix), TINK (prefix the ciphertext with 0x01 followed by a 4-byte key id in big endian
+ format) or CRUNCHY (prefix the ciphertext with 0x00 followed by a 4-byte key id in big endian
+ format)</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html#CRUNCHY">CRUNCHY</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html#NO_PREFIX">NO_PREFIX</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html#TINK">TINK</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="TINK">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>TINK</h4>
+<pre>public static final&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a> TINK</pre>
+</li>
+</ul>
+<a name="CRUNCHY">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CRUNCHY</h4>
+<pre>public static final&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a> CRUNCHY</pre>
+</li>
+</ul>
+<a name="NO_PREFIX">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NO_PREFIX</h4>
+<pre>public static final&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a> NO_PREFIX</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AesEaxParameters.Variant.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesGcmKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxParameters.Variant.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.Variant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxParameters.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxParameters.html
new file mode 100644
index 0000000..dc3e023
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesEaxParameters.html
@@ -0,0 +1,407 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>AesEaxParameters</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AesEaxParameters";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AesEaxParameters.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxParameters.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.google.crypto.tink.aead</div>
+<h2 title="Class AesEaxParameters" class="title">Class AesEaxParameters</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../com/google/crypto/tink/Parameters.html" title="class in com.google.crypto.tink">com.google.crypto.tink.Parameters</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../com/google/crypto/tink/aead/AeadParameters.html" title="class in com.google.crypto.tink.aead">com.google.crypto.tink.aead.AeadParameters</a></li>
+<li>
+<ul class="inheritance">
+<li>com.google.crypto.tink.aead.AesEaxParameters</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">AesEaxParameters</span>
+extends <a href="../../../../../com/google/crypto/tink/aead/AeadParameters.html" title="class in com.google.crypto.tink.aead">AeadParameters</a></pre>
+<div class="block">Describes the parameters of an <a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><code>AesEaxKey</code></a>.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></span></code>
+<div class="block">Builds a new AesEaxParameters instance.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></span></code>
+<div class="block">Describes how the prefix is computed.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html#builder--">builder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html#equals-java.lang.Object-">equals</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html#getIvSizeBytes--">getIvSizeBytes</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html#getKeySizeBytes--">getKeySizeBytes</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html#getTagSizeBytes--">getTagSizeBytes</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html#getVariant--">getVariant</a></span>()</code>
+<div class="block">Returns a variant object.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html#hasIdRequirement--">hasIdRequirement</a></span>()</code>
+<div class="block">Returns true if a key created with the parameters in this object has to have a certain ID when
+ it is in a keyset.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="builder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>builder</h4>
+<pre>public static&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a>&nbsp;builder()</pre>
+</li>
+</ul>
+<a name="getKeySizeBytes--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getKeySizeBytes</h4>
+<pre>public&nbsp;int&nbsp;getKeySizeBytes()</pre>
+</li>
+</ul>
+<a name="getIvSizeBytes--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getIvSizeBytes</h4>
+<pre>public&nbsp;int&nbsp;getIvSizeBytes()</pre>
+</li>
+</ul>
+<a name="getTagSizeBytes--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTagSizeBytes</h4>
+<pre>public&nbsp;int&nbsp;getTagSizeBytes()</pre>
+</li>
+</ul>
+<a name="getVariant--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getVariant</h4>
+<pre>public&nbsp;<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a>&nbsp;getVariant()</pre>
+<div class="block">Returns a variant object.</div>
+</li>
+</ul>
+<a name="equals-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>equals</h4>
+<pre>public&nbsp;boolean&nbsp;equals(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="hashCode--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>hashCode</h4>
+<pre>public&nbsp;int&nbsp;hashCode()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="hasIdRequirement--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>hasIdRequirement</h4>
+<pre>public&nbsp;boolean&nbsp;hasIdRequirement()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../com/google/crypto/tink/Parameters.html#hasIdRequirement--">Parameters</a></code></span></div>
+<div class="block">Returns true if a key created with the parameters in this object has to have a certain ID when
+ it is in a keyset.
+
+ <p>In Tink, certain keys change their behavior depending on the key id (for example, an <a href="../../../../../com/google/crypto/tink/Aead.html" title="interface in com.google.crypto.tink"><code>Aead</code></a> object can prefix the ciphertext with the big endian encoding of the key id). If this is
+ the case, such a key should require a unique id in <a href="../../../../../com/google/crypto/tink/Key.html#getIdRequirementOrNull--"><code>Key.getIdRequirementOrNull()</code></a> and
+ return true here.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../com/google/crypto/tink/Parameters.html#hasIdRequirement--">hasIdRequirement</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../com/google/crypto/tink/Parameters.html" title="class in com.google.crypto.tink">Parameters</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AesEaxParameters.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/aead/AesEaxParameters.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesGcmKeyManager.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesGcmKeyManager.html
index c4bc050..1b34501 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesGcmKeyManager.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/AesGcmKeyManager.html
@@ -48,7 +48,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../com/google/crypto/tink/aead/AesGcmSivKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -510,7 +510,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../com/google/crypto/tink/aead/AesGcmSivKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AeadKey.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AeadKey.html
index 341673c..54780ce 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AeadKey.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AeadKey.html
@@ -71,7 +71,49 @@
 <div class="header">
 <h2 title="Uses of Class com.google.crypto.tink.aead.AeadKey" class="title">Uses of Class<br>com.google.crypto.tink.aead.AeadKey</h2>
 </div>
-<div class="classUseContainer">No usage of com.google.crypto.tink.aead.AeadKey</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../../com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead">AeadKey</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#com.google.crypto.tink.aead">com.google.crypto.tink.aead</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="com.google.crypto.tink.aead">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead">AeadKey</a> in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../../../../com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead">AeadKey</a> in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></span></code>
+<div class="block">Represents an AES-EAX key used for computing AEAD.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AeadParameters.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AeadParameters.html
index c82e76e..93be275 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AeadParameters.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AeadParameters.html
@@ -94,6 +94,21 @@
 <!--   -->
 </a>
 <h3>Uses of <a href="../../../../../../com/google/crypto/tink/aead/AeadParameters.html" title="class in com.google.crypto.tink.aead">AeadParameters</a> in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../../../../com/google/crypto/tink/aead/AeadParameters.html" title="class in com.google.crypto.tink.aead">AeadParameters</a> in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></span></code>
+<div class="block">Describes the parameters of an <a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><code>AesEaxKey</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
 <caption><span>Methods in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> that return <a href="../../../../../../com/google/crypto/tink/aead/AeadParameters.html" title="class in com.google.crypto.tink.aead">AeadParameters</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxKey.Builder.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxKey.Builder.html
new file mode 100644
index 0000000..7bfdb37
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxKey.Builder.html
@@ -0,0 +1,175 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>Uses of Class com.google.crypto.tink.aead.AesEaxKey.Builder</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class com.google.crypto.tink.aead.AesEaxKey.Builder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/aead/class-use/AesEaxKey.Builder.html" target="_top">Frames</a></li>
+<li><a href="AesEaxKey.Builder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class com.google.crypto.tink.aead.AesEaxKey.Builder" class="title">Uses of Class<br>com.google.crypto.tink.aead.AesEaxKey.Builder</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#com.google.crypto.tink.aead">com.google.crypto.tink.aead</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="com.google.crypto.tink.aead">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a> in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> that return <a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxKey.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html#builder--">builder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxKey.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html#setIdRequirement-java.lang.Integer-">setIdRequirement</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&nbsp;idRequirement)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxKey.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html#setKeyBytes-com.google.crypto.tink.util.SecretBytes-">setKeyBytes</a></span>(<a href="../../../../../../com/google/crypto/tink/util/SecretBytes.html" title="class in com.google.crypto.tink.util">SecretBytes</a>&nbsp;keyBytes)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxKey.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html#setParameters-com.google.crypto.tink.aead.AesEaxParameters-">setParameters</a></span>(<a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a>&nbsp;parameters)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/aead/class-use/AesEaxKey.Builder.html" target="_top">Frames</a></li>
+<li><a href="AesEaxKey.Builder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxKey.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxKey.html
new file mode 100644
index 0000000..0bdb5d4
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxKey.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>Uses of Class com.google.crypto.tink.aead.AesEaxKey</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class com.google.crypto.tink.aead.AesEaxKey";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/aead/class-use/AesEaxKey.html" target="_top">Frames</a></li>
+<li><a href="AesEaxKey.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class com.google.crypto.tink.aead.AesEaxKey" class="title">Uses of Class<br>com.google.crypto.tink.aead.AesEaxKey</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#com.google.crypto.tink.aead">com.google.crypto.tink.aead</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="com.google.crypto.tink.aead">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a> in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> that return <a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxKey.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html#build--">build</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/aead/class-use/AesEaxKey.html" target="_top">Frames</a></li>
+<li><a href="AesEaxKey.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxParameters.Builder.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxParameters.Builder.html
new file mode 100644
index 0000000..3152c3b
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxParameters.Builder.html
@@ -0,0 +1,185 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>Uses of Class com.google.crypto.tink.aead.AesEaxParameters.Builder</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class com.google.crypto.tink.aead.AesEaxParameters.Builder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/aead/class-use/AesEaxParameters.Builder.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.Builder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class com.google.crypto.tink.aead.AesEaxParameters.Builder" class="title">Uses of Class<br>com.google.crypto.tink.aead.AesEaxParameters.Builder</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#com.google.crypto.tink.aead">com.google.crypto.tink.aead</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="com.google.crypto.tink.aead">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a> in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> that return <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxParameters.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html#builder--">builder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxParameters.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setIvSizeBytes-int-">setIvSizeBytes</a></span>(int&nbsp;ivSizeBytes)</code>
+<div class="block">IV size must be 12 or 16 bytes.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxParameters.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setKeySizeBytes-int-">setKeySizeBytes</a></span>(int&nbsp;keySizeBytes)</code>
+<div class="block">Accepts key sizes of 16, 24 or 32 bytes.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxParameters.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setTagSizeBytes-int-">setTagSizeBytes</a></span>(int&nbsp;tagSizeBytes)</code>
+<div class="block">The tag size accepts values between 0 and 16 bytes.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxParameters.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setVariant-com.google.crypto.tink.aead.AesEaxParameters.Variant-">setVariant</a></span>(<a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a>&nbsp;variant)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/aead/class-use/AesEaxParameters.Builder.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.Builder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxParameters.Variant.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxParameters.Variant.html
new file mode 100644
index 0000000..fe26e27
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxParameters.Variant.html
@@ -0,0 +1,199 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>Uses of Class com.google.crypto.tink.aead.AesEaxParameters.Variant</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class com.google.crypto.tink.aead.AesEaxParameters.Variant";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/aead/class-use/AesEaxParameters.Variant.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.Variant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class com.google.crypto.tink.aead.AesEaxParameters.Variant" class="title">Uses of Class<br>com.google.crypto.tink.aead.AesEaxParameters.Variant</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#com.google.crypto.tink.aead">com.google.crypto.tink.aead</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="com.google.crypto.tink.aead">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a> in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> declared as <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxParameters.Variant.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html#CRUNCHY">CRUNCHY</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxParameters.Variant.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html#NO_PREFIX">NO_PREFIX</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxParameters.Variant.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html#TINK">TINK</a></span></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> that return <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxParameters.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html#getVariant--">getVariant</a></span>()</code>
+<div class="block">Returns a variant object.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> with parameters of type <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxParameters.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setVariant-com.google.crypto.tink.aead.AesEaxParameters.Variant-">setVariant</a></span>(<a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a>&nbsp;variant)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/aead/class-use/AesEaxParameters.Variant.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.Variant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxParameters.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxParameters.html
new file mode 100644
index 0000000..f0f2229
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/class-use/AesEaxParameters.html
@@ -0,0 +1,180 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>Uses of Class com.google.crypto.tink.aead.AesEaxParameters</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class com.google.crypto.tink.aead.AesEaxParameters";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/aead/class-use/AesEaxParameters.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class com.google.crypto.tink.aead.AesEaxParameters" class="title">Uses of Class<br>com.google.crypto.tink.aead.AesEaxParameters</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#com.google.crypto.tink.aead">com.google.crypto.tink.aead</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="com.google.crypto.tink.aead">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a> in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> that return <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxParameters.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html#build--">build</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxKey.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html#getParameters--">getParameters</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> with parameters of type <a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxKey.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html#setParameters-com.google.crypto.tink.aead.AesEaxParameters-">setParameters</a></span>(<a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a>&nbsp;parameters)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/aead/class-use/AesEaxParameters.html" target="_top">Frames</a></li>
+<li><a href="AesEaxParameters.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-frame.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-frame.html
index f23fc95..a499393 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-frame.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-frame.html
@@ -20,7 +20,12 @@
 <li><a href="AeadWrapper.html" title="class in com.google.crypto.tink.aead" target="classFrame">AeadWrapper</a></li>
 <li><a href="AesCtrHmacAeadKeyManager.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesCtrHmacAeadKeyManager</a></li>
 <li><a href="AesCtrKeyManager.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesCtrKeyManager</a></li>
+<li><a href="AesEaxKey.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxKey</a></li>
+<li><a href="AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxKey.Builder</a></li>
 <li><a href="AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxKeyManager</a></li>
+<li><a href="AesEaxParameters.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxParameters</a></li>
+<li><a href="AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxParameters.Builder</a></li>
+<li><a href="AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesEaxParameters.Variant</a></li>
 <li><a href="AesGcmKeyManager.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesGcmKeyManager</a></li>
 <li><a href="AesGcmSivKeyManager.html" title="class in com.google.crypto.tink.aead" target="classFrame">AesGcmSivKeyManager</a></li>
 <li><a href="ChaCha20Poly1305KeyManager.html" title="class in com.google.crypto.tink.aead" target="classFrame">ChaCha20Poly1305KeyManager</a></li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-summary.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-summary.html
index 630f20e..30be29f 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-summary.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-summary.html
@@ -134,52 +134,82 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></td>
+<td class="colLast">
+<div class="block">Represents an AES-EAX key used for computing AEAD.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></td>
+<td class="colLast">
+<div class="block">Builder for AesEaxKey.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKeyManager.html" title="class in com.google.crypto.tink.aead">AesEaxKeyManager</a></td>
 <td class="colLast">
 <div class="block">This key manager generates new <code>AesEaxKey</code> keys and produces new instances of <code>AesEaxJce</code>.</div>
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></td>
+<td class="colLast">
+<div class="block">Describes the parameters of an <a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><code>AesEaxKey</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></td>
+<td class="colLast">
+<div class="block">Builds a new AesEaxParameters instance.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></td>
+<td class="colLast">
+<div class="block">Describes how the prefix is computed.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/AesGcmKeyManager.html" title="class in com.google.crypto.tink.aead">AesGcmKeyManager</a></td>
 <td class="colLast">
 <div class="block">This key manager generates new <code>AesGcmKey</code> keys and produces new instances of <code>AesGcmJce</code>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/AesGcmSivKeyManager.html" title="class in com.google.crypto.tink.aead">AesGcmSivKeyManager</a></td>
 <td class="colLast">
 <div class="block">This key manager generates new <code>AesGcmSivKey</code> keys and produces new instances of <code>AesGcmSiv</code>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/ChaCha20Poly1305KeyManager.html" title="class in com.google.crypto.tink.aead">ChaCha20Poly1305KeyManager</a></td>
 <td class="colLast">
 <div class="block">This instance of <code>KeyManager</code> generates new <code>ChaCha20Poly1305</code> keys and produces new
  instances of <code>ChaCha20Poly1305</code>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/KmsAeadKeyManager.html" title="class in com.google.crypto.tink.aead">KmsAeadKeyManager</a></td>
 <td class="colLast">
 <div class="block">This key manager produces new instances of <code>Aead</code> that forwards encrypt/decrypt requests to
  a key residing in a remote KMS.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/KmsEnvelopeAead.html" title="class in com.google.crypto.tink.aead">KmsEnvelopeAead</a></td>
 <td class="colLast">
 <div class="block">This primitive implements <a href="https://cloud.google.com/kms/docs/data-encryption-keys">
  envelope encryption</a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/KmsEnvelopeAeadKeyManager.html" title="class in com.google.crypto.tink.aead">KmsEnvelopeAeadKeyManager</a></td>
 <td class="colLast">
 <div class="block">This key manager generates new <code>KmsEnvelopeAeadKey</code> keys and produces new instances of
  <code>KmsEnvelopeAead</code>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/aead/XChaCha20Poly1305KeyManager.html" title="class in com.google.crypto.tink.aead">XChaCha20Poly1305KeyManager</a></td>
 <td class="colLast">
 <div class="block">This instance of <code>KeyManager</code> generates new <code>XChaCha20Poly1305</code> keys and produces new
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-tree.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-tree.html
index 46b0cf3..9973b34 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-tree.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-tree.html
@@ -84,9 +84,16 @@
 <li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AeadFactory.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AeadFactory</span></a></li>
 <li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AeadKeyTemplates.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AeadKeyTemplates</span></a></li>
 <li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AeadWrapper.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AeadWrapper</span></a> (implements com.google.crypto.tink.<a href="../../../../../com/google/crypto/tink/PrimitiveWrapper.html" title="interface in com.google.crypto.tink">PrimitiveWrapper</a>&lt;B,P&gt;)</li>
+<li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxKey.Builder</span></a></li>
+<li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxParameters.Builder</span></a></li>
+<li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxParameters.Variant</span></a></li>
 <li type="circle">com.google.crypto.tink.<a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><span class="typeNameLink">Key</span></a>
 <ul>
-<li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AeadKey</span></a></li>
+<li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AeadKey</span></a>
+<ul>
+<li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxKey</span></a></li>
+</ul>
+</li>
 </ul>
 </li>
 <li type="circle">com.google.crypto.tink.internal.<a href="../../../../../com/google/crypto/tink/internal/KeyTypeManager.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">KeyTypeManager</span></a>&lt;KeyProtoT&gt;
@@ -105,7 +112,11 @@
 <li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/KmsEnvelopeAead.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">KmsEnvelopeAead</span></a> (implements com.google.crypto.tink.<a href="../../../../../com/google/crypto/tink/Aead.html" title="interface in com.google.crypto.tink">Aead</a>)</li>
 <li type="circle">com.google.crypto.tink.<a href="../../../../../com/google/crypto/tink/Parameters.html" title="class in com.google.crypto.tink"><span class="typeNameLink">Parameters</span></a>
 <ul>
-<li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AeadParameters.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AeadParameters</span></a></li>
+<li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AeadParameters.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AeadParameters</span></a>
+<ul>
+<li type="circle">com.google.crypto.tink.aead.<a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxParameters</span></a></li>
+</ul>
+</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-use.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-use.html
index f9f37f2..273d9e4 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-use.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/aead/package-use.html
@@ -98,10 +98,40 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colOne"><a href="../../../../../com/google/crypto/tink/aead/class-use/AeadKey.html#com.google.crypto.tink.aead">AeadKey</a>
+<div class="block">Represents functions to encrypt and decrypt data using AEAD.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="../../../../../com/google/crypto/tink/aead/class-use/AeadParameters.html#com.google.crypto.tink.aead">AeadParameters</a>
 <div class="block">Represents a description of a <a href="../../../../../com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead"><code>AeadKey</code></a></div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../com/google/crypto/tink/aead/class-use/AesEaxKey.html#com.google.crypto.tink.aead">AesEaxKey</a>
+<div class="block">Represents an AES-EAX key used for computing AEAD.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../com/google/crypto/tink/aead/class-use/AesEaxKey.Builder.html#com.google.crypto.tink.aead">AesEaxKey.Builder</a>
+<div class="block">Builder for AesEaxKey.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../com/google/crypto/tink/aead/class-use/AesEaxParameters.html#com.google.crypto.tink.aead">AesEaxParameters</a>
+<div class="block">Describes the parameters of an <a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><code>AesEaxKey</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../com/google/crypto/tink/aead/class-use/AesEaxParameters.Builder.html#com.google.crypto.tink.aead">AesEaxParameters.Builder</a>
+<div class="block">Builds a new AesEaxParameters instance.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../com/google/crypto/tink/aead/class-use/AesEaxParameters.Variant.html#com.google.crypto.tink.aead">AesEaxParameters.Variant</a>
+<div class="block">Describes how the prefix is computed.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/annotations/class-use/Alpha.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/annotations/class-use/Alpha.html
index d6aca00..28eef48 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/annotations/class-use/Alpha.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/annotations/class-use/Alpha.html
@@ -86,30 +86,34 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="#com.google.crypto.tink.aead">com.google.crypto.tink.aead</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.aead.subtle">com.google.crypto.tink.aead.subtle</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.internal">com.google.crypto.tink.internal</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.mac">com.google.crypto.tink.mac</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.monitoring">com.google.crypto.tink.monitoring</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.signature">com.google.crypto.tink.signature</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.subtle">com.google.crypto.tink.subtle</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.util">com.google.crypto.tink.util</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -190,6 +194,26 @@
 </tbody>
 </table>
 </li>
+<li class="blockList"><a name="com.google.crypto.tink.aead">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../com/google/crypto/tink/annotations/Alpha.html" title="annotation in com.google.crypto.tink.annotations">Alpha</a> in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> with annotations of type <a href="../../../../../../com/google/crypto/tink/annotations/Alpha.html" title="annotation in com.google.crypto.tink.annotations">Alpha</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></span></code>
+<div class="block">Represents an AES-EAX key used for computing AEAD.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
 <li class="blockList"><a name="com.google.crypto.tink.aead.subtle">
 <!--   -->
 </a>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/annotations/package-use.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/annotations/package-use.html
index 8dd510b..48b597e 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/annotations/package-use.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/annotations/package-use.html
@@ -86,30 +86,34 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="#com.google.crypto.tink.aead">com.google.crypto.tink.aead</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.aead.subtle">com.google.crypto.tink.aead.subtle</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.internal">com.google.crypto.tink.internal</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.mac">com.google.crypto.tink.mac</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.monitoring">com.google.crypto.tink.monitoring</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.signature">com.google.crypto.tink.signature</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.subtle">com.google.crypto.tink.subtle</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.util">com.google.crypto.tink.util</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -134,6 +138,24 @@
 </tbody>
 </table>
 </li>
+<li class="blockList"><a name="com.google.crypto.tink.aead">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../../../com/google/crypto/tink/annotations/package-summary.html">com.google.crypto.tink.annotations</a> used by <a href="../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../com/google/crypto/tink/annotations/class-use/Alpha.html#com.google.crypto.tink.aead">Alpha</a>
+<div class="block">Signifies that a public API (public class, method or field) is subject to incompatible changes,
+ or even removal, in a future release.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
 <li class="blockList"><a name="com.google.crypto.tink.aead.subtle">
 <!--   -->
 </a>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/Key.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/Key.html
index acdc387..712d28b 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/Key.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/Key.html
@@ -173,6 +173,25 @@
 <div class="block">Represents functions to encrypt and decrypt data using AEAD.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></span></code>
+<div class="block">Represents an AES-EAX key used for computing AEAD.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> with parameters of type <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink">Key</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxKey.</span><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html#equalsKey-com.google.crypto.tink.Key-">equalsKey</a></span>(<a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink">Key</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/KeyTemplate.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/KeyTemplate.html
index 26d3fc0..22d1f96 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/KeyTemplate.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/KeyTemplate.html
@@ -841,6 +841,7 @@
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink">KeyTemplate</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TinkKey.</span><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html#getKeyTemplate--">getKeyTemplate</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">A <code>TinkKey</code> should know the <code>KeyTemplate</code> from which it was generated,
  which in turn specifies the cryptographic algorithm in which the <code>TinkKey</code> should
  be used.</div>
@@ -849,6 +850,7 @@
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink">KeyTemplate</a></code></td>
 <td class="colLast"><span class="typeNameLabel">KeyHandle.</span><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#getKeyTemplate--">getKeyTemplate</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the <a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink"><code>KeyTemplate</code></a> of the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a>.</div>
 </td>
 </tr>
@@ -864,6 +866,7 @@
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></code></td>
 <td class="colLast"><span class="typeNameLabel">KeyHandle.</span><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#generateNew-com.google.crypto.tink.KeyTemplate-">generateNew</a></span>(<a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink">KeyTemplate</a>&nbsp;keyTemplate)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Generates a new <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a> that contains a fresh key generated according to <code>keyTemplate</code>.</div>
 </td>
 </tr>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/Parameters.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/Parameters.html
index 2923376..f9c5381 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/Parameters.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/Parameters.html
@@ -167,6 +167,12 @@
 <div class="block">Represents a description of a <a href="../../../../../com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead"><code>AeadKey</code></a></div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></span></code>
+<div class="block">Describes the parameters of an <a href="../../../../../com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><code>AesEaxKey</code></a>.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/SecretKeyAccess.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/SecretKeyAccess.html
index 48af2b6..da2b421 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/SecretKeyAccess.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/class-use/SecretKeyAccess.html
@@ -118,7 +118,7 @@
 <tr class="rowColor">
 <td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink">SecretKeyAccess</a></code></td>
 <td class="colLast"><span class="typeNameLabel">SecretKeyAccess.</span><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html#requireAccess-com.google.crypto.tink.SecretKeyAccess-">requireAccess</a></span>(<a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink">SecretKeyAccess</a>&nbsp;access)</code>
-<div class="block">Throws an exception if the passed in SecretKeyAccess is null, otherwise returns it.</div>
+<div class="block">Throws an exception if the passed in <a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> is null, otherwise returns it.</div>
 </td>
 </tr>
 </tbody>
@@ -143,7 +143,7 @@
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink">SecretKeyAccess</a></code></td>
 <td class="colLast"><span class="typeNameLabel">SecretKeyAccess.</span><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html#requireAccess-com.google.crypto.tink.SecretKeyAccess-">requireAccess</a></span>(<a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink">SecretKeyAccess</a>&nbsp;access)</code>
-<div class="block">Throws an exception if the passed in SecretKeyAccess is null, otherwise returns it.</div>
+<div class="block">Throws an exception if the passed in <a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> is null, otherwise returns it.</div>
 </td>
 </tr>
 <tr class="rowColor">
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/BigIntegerEncoding.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/BigIntegerEncoding.html
new file mode 100644
index 0000000..f501e67
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/BigIntegerEncoding.html
@@ -0,0 +1,266 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>BigIntegerEncoding</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="BigIntegerEncoding";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/BigIntegerEncoding.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../../com/google/crypto/tink/internal/EllipticCurvesUtil.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/internal/BigIntegerEncoding.html" target="_top">Frames</a></li>
+<li><a href="BigIntegerEncoding.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.google.crypto.tink.internal</div>
+<h2 title="Class BigIntegerEncoding" class="title">Class BigIntegerEncoding</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>com.google.crypto.tink.internal.BigIntegerEncoding</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">BigIntegerEncoding</span>
+extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<div class="block">Helper class with functions that encode and decode non-negative <a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math"><code>BigInteger</code></a> to
+ and from <code>byte[]</code>.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math">BigInteger</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/internal/BigIntegerEncoding.html#fromUnsignedBigEndianBytes-byte:A-">fromUnsignedBigEndianBytes</a></span>(byte[]&nbsp;bytes)</code>
+<div class="block">Parses a <a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math"><code>BigInteger</code></a> from a byte array using unsigned big-endian encoding.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static byte[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/internal/BigIntegerEncoding.html#toBigEndianBytes-java.math.BigInteger-">toBigEndianBytes</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math">BigInteger</a>&nbsp;n)</code>
+<div class="block">Encodes a non-negative <a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math"><code>BigInteger</code></a> into the minimal two's-complement
+ representation in big-endian byte-order.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="toBigEndianBytes-java.math.BigInteger-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toBigEndianBytes</h4>
+<pre>public static&nbsp;byte[]&nbsp;toBigEndianBytes(<a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math">BigInteger</a>&nbsp;n)</pre>
+<div class="block">Encodes a non-negative <a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math"><code>BigInteger</code></a> into the minimal two's-complement
+ representation in big-endian byte-order.
+
+ <p>The most significant bit of the first byte is the sign bit, which is always 0 because the
+ input number is non-negative. Because of that, the output is at the same time also an unsigned
+ big-endian encoding that may have an additional zero byte at the beginning, and can be parsed
+ with <a href="../../../../../com/google/crypto/tink/internal/BigIntegerEncoding.html#fromUnsignedBigEndianBytes-byte:A-"><code>fromUnsignedBigEndianBytes(byte[])</code></a>.</div>
+</li>
+</ul>
+<a name="fromUnsignedBigEndianBytes-byte:A-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>fromUnsignedBigEndianBytes</h4>
+<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math">BigInteger</a>&nbsp;fromUnsignedBigEndianBytes(byte[]&nbsp;bytes)</pre>
+<div class="block">Parses a <a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math"><code>BigInteger</code></a> from a byte array using unsigned big-endian encoding.
+
+ <p>See also <a href="https://www.rfc-editor.org/rfc/rfc8017#section-4.2">RFC 8017, Sec. 4.2</a></div>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/BigIntegerEncoding.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../../com/google/crypto/tink/internal/EllipticCurvesUtil.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?com/google/crypto/tink/internal/BigIntegerEncoding.html" target="_top">Frames</a></li>
+<li><a href="BigIntegerEncoding.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/EllipticCurvesUtil.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/EllipticCurvesUtil.html
index adf2327..60bc5a8 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/EllipticCurvesUtil.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/EllipticCurvesUtil.html
@@ -48,7 +48,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a href="../../../../../com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../com/google/crypto/tink/internal/JsonParser.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -335,7 +335,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a href="../../../../../com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../com/google/crypto/tink/internal/JsonParser.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/class-use/BigIntegerEncoding.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/class-use/BigIntegerEncoding.html
new file mode 100644
index 0000000..c9ab9eb
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/class-use/BigIntegerEncoding.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<title>Uses of Class com.google.crypto.tink.internal.BigIntegerEncoding</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class com.google.crypto.tink.internal.BigIntegerEncoding";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/internal/class-use/BigIntegerEncoding.html" target="_top">Frames</a></li>
+<li><a href="BigIntegerEncoding.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class com.google.crypto.tink.internal.BigIntegerEncoding" class="title">Uses of Class<br>com.google.crypto.tink.internal.BigIntegerEncoding</h2>
+</div>
+<div class="classUseContainer">No usage of com.google.crypto.tink.internal.BigIntegerEncoding</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/internal/class-use/BigIntegerEncoding.html" target="_top">Frames</a></li>
+<li><a href="BigIntegerEncoding.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-frame.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-frame.html
index bf76060..801c639 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-frame.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-frame.html
@@ -21,6 +21,7 @@
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
+<li><a href="BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal" target="classFrame">BigIntegerEncoding</a></li>
 <li><a href="EllipticCurvesUtil.html" title="class in com.google.crypto.tink.internal" target="classFrame">EllipticCurvesUtil</a></li>
 <li><a href="JsonParser.html" title="class in com.google.crypto.tink.internal" target="classFrame">JsonParser</a></li>
 <li><a href="KeyParser.html" title="class in com.google.crypto.tink.internal" target="classFrame">KeyParser</a></li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-summary.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-summary.html
index 222a74c..2f44690 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-summary.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-summary.html
@@ -129,168 +129,175 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal">BigIntegerEncoding</a></td>
+<td class="colLast">
+<div class="block">Helper class with functions that encode and decode non-negative <a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math"><code>BigInteger</code></a> to
+ and from <code>byte[]</code>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/EllipticCurvesUtil.html" title="class in com.google.crypto.tink.internal">EllipticCurvesUtil</a></td>
 <td class="colLast">
 <div class="block">Utility functions for elliptic curve crypto, used in ECDSA and ECDH.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/JsonParser.html" title="class in com.google.crypto.tink.internal">JsonParser</a></td>
 <td class="colLast">
 <div class="block">A JSON Parser based on the GSON JsonReader.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/KeyParser.html" title="class in com.google.crypto.tink.internal">KeyParser</a>&lt;SerializationT extends <a href="../../../../../com/google/crypto/tink/internal/Serialization.html" title="interface in com.google.crypto.tink.internal">Serialization</a>&gt;</td>
 <td class="colLast">
 <div class="block">Parses <code>Serialization</code> objects into <code>Key</code> objects of a certain kind.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/KeySerializer.html" title="class in com.google.crypto.tink.internal">KeySerializer</a>&lt;KeyT extends <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink">Key</a>,SerializationT extends <a href="../../../../../com/google/crypto/tink/internal/Serialization.html" title="interface in com.google.crypto.tink.internal">Serialization</a>&gt;</td>
 <td class="colLast">
 <div class="block">Serializes <code>Key</code> objects into <code>Serialization</code> objects of a certain kind.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/KeyStatusTypeProtoConverter.html" title="class in com.google.crypto.tink.internal">KeyStatusTypeProtoConverter</a></td>
 <td class="colLast">
 <div class="block">Util functions to facilitate conversion between the <code>KeyHandle.KeyStatusType</code> enum and
  <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey"><code>KeyHandle.KeyStatusType</code></a> proto.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/KeyTemplateProtoConverter.html" title="class in com.google.crypto.tink.internal">KeyTemplateProtoConverter</a></td>
 <td class="colLast">
 <div class="block">KeyTemplateProtoConverter converts KeyTemplate to and from the binary proto format.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/KeyTypeManager.html" title="class in com.google.crypto.tink.internal">KeyTypeManager</a>&lt;KeyProtoT extends com.google.protobuf.MessageLite&gt;</td>
 <td class="colLast">
 <div class="block">An object which collects all the operations which one can do on for a single key type, identified
  by a single KeyProto.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/KeyTypeManager.KeyFactory.html" title="class in com.google.crypto.tink.internal">KeyTypeManager.KeyFactory</a>&lt;KeyFormatProtoT extends com.google.protobuf.MessageLite,KeyProtoT extends com.google.protobuf.MessageLite&gt;</td>
 <td class="colLast">
 <div class="block">A <code>KeyFactory</code> creates new keys from a given KeyFormat.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/KeyTypeManager.KeyFactory.KeyFormat.html" title="class in com.google.crypto.tink.internal">KeyTypeManager.KeyFactory.KeyFormat</a>&lt;KeyFormatProtoT&gt;</td>
 <td class="colLast">
 <div class="block">A container that contains key format and other information that form key templates supported
  by this factory.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/LegacyProtoKey.html" title="class in com.google.crypto.tink.internal">LegacyProtoKey</a></td>
 <td class="colLast">
 <div class="block">Implements a Key for legacy types where no actual parser is present.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/LegacyProtoParameters.html" title="class in com.google.crypto.tink.internal">LegacyProtoParameters</a></td>
 <td class="colLast">
 <div class="block">Implements a Parameters object for legacy types where no actual Parameters object is present.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/MonitoringUtil.html" title="class in com.google.crypto.tink.internal">MonitoringUtil</a></td>
 <td class="colLast">
 <div class="block">Some util functions needed to add monitoring to the Primitives.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/MutableMonitoringRegistry.html" title="class in com.google.crypto.tink.internal">MutableMonitoringRegistry</a></td>
 <td class="colLast">
 <div class="block">A Registry for MonitoringClient.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/MutablePrimitiveRegistry.html" title="class in com.google.crypto.tink.internal">MutablePrimitiveRegistry</a></td>
 <td class="colLast">
 <div class="block">A Mutable version of the <a href="../../../../../com/google/crypto/tink/internal/PrimitiveRegistry.html" title="class in com.google.crypto.tink.internal"><code>PrimitiveRegistry</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/MutableSerializationRegistry.html" title="class in com.google.crypto.tink.internal">MutableSerializationRegistry</a></td>
 <td class="colLast">
 <div class="block">A Mutable version of the <a href="../../../../../com/google/crypto/tink/internal/SerializationRegistry.html" title="class in com.google.crypto.tink.internal"><code>SerializationRegistry</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/ParametersParser.html" title="class in com.google.crypto.tink.internal">ParametersParser</a>&lt;SerializationT extends <a href="../../../../../com/google/crypto/tink/internal/Serialization.html" title="interface in com.google.crypto.tink.internal">Serialization</a>&gt;</td>
 <td class="colLast">
 <div class="block">Parses <code>Serialization</code> objects into <code>Parameters</code> objects of a certain kind.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/ParametersSerializer.html" title="class in com.google.crypto.tink.internal">ParametersSerializer</a>&lt;ParametersT extends <a href="../../../../../com/google/crypto/tink/Parameters.html" title="class in com.google.crypto.tink">Parameters</a>,SerializationT extends <a href="../../../../../com/google/crypto/tink/internal/Serialization.html" title="interface in com.google.crypto.tink.internal">Serialization</a>&gt;</td>
 <td class="colLast">
 <div class="block">Serializes <code>Parameters</code> objects into <code>Serialization</code> objects of a certain kind.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/PrimitiveConstructor.html" title="class in com.google.crypto.tink.internal">PrimitiveConstructor</a>&lt;KeyT extends <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink">Key</a>,PrimitiveT&gt;</td>
 <td class="colLast">
 <div class="block">Create Primitive objects from <code>Key</code> objects of a certain kind.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/PrimitiveFactory.html" title="class in com.google.crypto.tink.internal">PrimitiveFactory</a>&lt;PrimitiveT,KeyProtoT extends com.google.protobuf.MessageLite&gt;</td>
 <td class="colLast">
 <div class="block">A PrimitiveFactory knows how to create primitives from a given key.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/PrimitiveRegistry.html" title="class in com.google.crypto.tink.internal">PrimitiveRegistry</a></td>
 <td class="colLast">
 <div class="block">Allows registering <code>PrimitiveConstructor</code> objects, and creating primitives with those
  objects.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/PrimitiveRegistry.Builder.html" title="class in com.google.crypto.tink.internal">PrimitiveRegistry.Builder</a></td>
 <td class="colLast">
 <div class="block">Allows building PrimitiveRegistry objects.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/PrivateKeyTypeManager.html" title="class in com.google.crypto.tink.internal">PrivateKeyTypeManager</a>&lt;KeyProtoT extends com.google.protobuf.MessageLite,PublicKeyProtoT extends com.google.protobuf.MessageLite&gt;</td>
 <td class="colLast">
 <div class="block">A PrivateKeyManager is like an <a href="../../../../../com/google/crypto/tink/internal/KeyTypeManager.html" title="class in com.google.crypto.tink.internal"><code>KeyTypeManager</code></a>, but additionally has a method to create a
  public key.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/ProtoKeySerialization.html" title="class in com.google.crypto.tink.internal">ProtoKeySerialization</a></td>
 <td class="colLast">
 <div class="block">* Represents a <code>Key</code> object serialized with binary protobuf Serialization.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/ProtoParametersSerialization.html" title="class in com.google.crypto.tink.internal">ProtoParametersSerialization</a></td>
 <td class="colLast">
 <div class="block">Represents a <code>Parameters</code> object serialized with binary protobuf Serialization.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/SerializationRegistry.html" title="class in com.google.crypto.tink.internal">SerializationRegistry</a></td>
 <td class="colLast">
 <div class="block">Allows registering <code>KeySerializer</code>, <code>KeyParser</code>, <code>ParametersSerializer</code>, and
  <a href="../../../../../com/google/crypto/tink/internal/ParametersParser.html" title="class in com.google.crypto.tink.internal"><code>ParametersParser</code></a> objects, and parsing/serializing keys and key formats with such objects.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/SerializationRegistry.Builder.html" title="class in com.google.crypto.tink.internal">SerializationRegistry.Builder</a></td>
 <td class="colLast">
 <div class="block">Allows building SerializationRegistry objects.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/internal/Util.html" title="class in com.google.crypto.tink.internal">Util</a></td>
 <td class="colLast">
 <div class="block">Helper functions used throughout Tink, for Tink internal use only.</div>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-tree.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-tree.html
index 1098f57..cc2f33f 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-tree.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/internal/package-tree.html
@@ -80,6 +80,7 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
 <ul>
+<li type="circle">com.google.crypto.tink.internal.<a href="../../../../../com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">BigIntegerEncoding</span></a></li>
 <li type="circle">com.google.crypto.tink.internal.<a href="../../../../../com/google/crypto/tink/internal/EllipticCurvesUtil.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">EllipticCurvesUtil</span></a></li>
 <li type="circle">com.google.crypto.tink.internal.<a href="../../../../../com/google/crypto/tink/internal/JsonParser.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">JsonParser</span></a></li>
 <li type="circle">com.google.crypto.tink.<a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><span class="typeNameLink">Key</span></a>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/subtle/SubtleUtil.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/subtle/SubtleUtil.html
index cb9c597..969a268 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/subtle/SubtleUtil.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/subtle/SubtleUtil.html
@@ -17,7 +17,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":41,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9};
+var methods = {"i0":41,"i1":41,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -140,8 +140,7 @@
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math">BigInteger</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/subtle/SubtleUtil.html#bytes2Integer-byte:A-">bytes2Integer</a></span>(byte[]&nbsp;bs)</code>
-<div class="block">Converts an byte array to a nonnegative integer
- (https://tools.ietf.org/html/rfc8017#section-4.1).</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
@@ -304,8 +303,12 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>bytes2Integer</h4>
-<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math">BigInteger</a>&nbsp;bytes2Integer(byte[]&nbsp;bs)</pre>
-<div class="block">Converts an byte array to a nonnegative integer
+<pre>@InlineMe(replacement="BigIntegerEncoding.fromUnsignedBigEndianBytes(bs)",
+          imports="com.google.crypto.tink.internal.BigIntegerEncoding")
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math">BigInteger</a>&nbsp;bytes2Integer(byte[]&nbsp;bs)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<div class="block">Converts an unsigned, big-endian encoded byte array to a non-negative integer
  (https://tools.ietf.org/html/rfc8017#section-4.1).</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/KeyAccess.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/KeyAccess.html
index 23a8376..ad60788 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/KeyAccess.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/KeyAccess.html
@@ -17,8 +17,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":42,"i1":41};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -107,14 +107,17 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> instead.</span></div>
+</div>
 <br>
 <pre>@Immutable
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
 public final class <span class="typeNameLabel">KeyAccess</span>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">An access token for <code>TinkKey</code>. Access to Tink keys is governed by <code>KeyHandle</code>. A
- <code>TinkKey</code> which does not have a secret should be accessible by tokens generated by
- <code>KeyAccess.publicAccess()</code>. A <code>TinkKey</code> with a secret should need a token generated
- by <code>SecretKeyAccess.secretAccess()</code>.</div>
+ <code>TinkKey</code> which does not have a secret should be accessible by tokens generated by <code>KeyAccess.publicAccess()</code>. A <code>TinkKey</code> with a secret should need a token generated by
+ <code>SecretKeyAccess.secretAccess()</code>.</div>
 </li>
 </ul>
 </div>
@@ -128,7 +131,7 @@
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -136,12 +139,14 @@
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html#canAccessSecret--">canAccessSecret</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns true if the <code>KeyAccess</code> instance grants access to a key's secret</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html#publicAccess--">publicAccess</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns a <code>KeyAccess</code> instance where <code>canAccessSecret()</code> returns false.</div>
 </td>
 </tr>
@@ -174,6 +179,7 @@
 <li class="blockList">
 <h4>publicAccess</h4>
 <pre>public static&nbsp;<a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a>&nbsp;publicAccess()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns a <code>KeyAccess</code> instance where <code>canAccessSecret()</code> returns false.</div>
 </li>
 </ul>
@@ -184,6 +190,7 @@
 <li class="blockList">
 <h4>canAccessSecret</h4>
 <pre>public&nbsp;boolean&nbsp;canAccessSecret()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns true if the <code>KeyAccess</code> instance grants access to a key's secret</div>
 </li>
 </ul>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/KeyHandle.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/KeyHandle.html
index 12f08ce..540659d 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/KeyHandle.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/KeyHandle.html
@@ -17,7 +17,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":41,"i1":9,"i2":9,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var methods = {"i0":41,"i1":41,"i2":41,"i3":42,"i4":42,"i5":42,"i6":42,"i7":42};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -111,8 +111,12 @@
 <dd><a href="../../../../../com/google/crypto/tink/tinkkey/internal/InternalKeyHandle.html" title="class in com.google.crypto.tink.tinkkey.internal">InternalKeyHandle</a></dd>
 </dl>
 <hr>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
+</div>
 <br>
 <pre>@Immutable
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
 public class <span class="typeNameLabel">KeyHandle</span>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Wraps a <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> and enforces access to the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> with <a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a>. Specifically, if the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> has a secret, then one can only get
@@ -138,6 +142,7 @@
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey">KeyHandle.KeyStatusType</a></span></code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">KeyStatusType is metadata associated to a key which is only meaningful when the key is part of
  a <code>Keyset</code>.</div>
 </td>
@@ -162,6 +167,7 @@
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#KeyHandle-com.google.crypto.tink.tinkkey.TinkKey-com.google.crypto.tink.tinkkey.KeyHandle.KeyStatusType-int-">KeyHandle</a></span>(<a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a>&nbsp;key,
          <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey">KeyHandle.KeyStatusType</a>&nbsp;status,
          int&nbsp;keyId)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Constructor intended for Tink internal purposes; allows one to set all the member variables of
  a <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a>.</div>
 </td>
@@ -194,6 +200,7 @@
 <td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#createFromKey-com.google.crypto.tink.tinkkey.TinkKey-com.google.crypto.tink.tinkkey.KeyAccess-">createFromKey</a></span>(<a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a>&nbsp;key,
              <a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a>&nbsp;access)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns a <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a> instance with <code>key</code> as the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> if the
  caller provides the correct <a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a> instance.</div>
 </td>
@@ -201,18 +208,21 @@
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#generateNew-com.google.crypto.tink.KeyTemplate-">generateNew</a></span>(<a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink">KeyTemplate</a>&nbsp;keyTemplate)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Generates a new <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a> that contains a fresh key generated according to <code>keyTemplate</code>.</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#getId--">getId</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the key ID of this key.</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#getKey-com.google.crypto.tink.tinkkey.KeyAccess-">getKey</a></span>(<a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a>&nbsp;access)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> key if <code>access</code> is a <a href="../../../../../com/google/crypto/tink/tinkkey/SecretKeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>SecretKeyAccess</code></a> and
  the key has a secret, or if the key does not have a secret, otherwise throws a <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security"><code>GeneralSecurityException</code></a>.</div>
 </td>
@@ -220,18 +230,21 @@
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink">KeyTemplate</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#getKeyTemplate--">getKeyTemplate</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the <a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink"><code>KeyTemplate</code></a> of the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a>.</div>
 </td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey">KeyHandle.KeyStatusType</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#getStatus--">getStatus</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the status of the key.</div>
 </td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#hasSecret--">hasSecret</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns <code>true</code> if the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> has a secret.</div>
 </td>
 </tr>
@@ -266,6 +279,7 @@
 <pre>protected&nbsp;KeyHandle(<a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a>&nbsp;key,
                     <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey">KeyHandle.KeyStatusType</a>&nbsp;status,
                     int&nbsp;keyId)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Constructor intended for Tink internal purposes; allows one to set all the member variables of
  a <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a>.</div>
 </li>
@@ -287,6 +301,7 @@
 <pre>public static&nbsp;<a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a>&nbsp;createFromKey(<a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a>&nbsp;key,
                                       <a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a>&nbsp;access)
                                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns a <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a> instance with <code>key</code> as the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> if the
  caller provides the correct <a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a> instance.</div>
 <dl>
@@ -318,6 +333,7 @@
 <h4>generateNew</h4>
 <pre>public static&nbsp;<a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a>&nbsp;generateNew(<a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink">KeyTemplate</a>&nbsp;keyTemplate)
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Generates a new <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a> that contains a fresh key generated according to <code>keyTemplate</code>.</div>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -333,6 +349,7 @@
 <li class="blockList">
 <h4>hasSecret</h4>
 <pre>public&nbsp;boolean&nbsp;hasSecret()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns <code>true</code> if the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> has a secret.</div>
 </li>
 </ul>
@@ -343,6 +360,7 @@
 <li class="blockList">
 <h4>getStatus</h4>
 <pre>public&nbsp;<a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey">KeyHandle.KeyStatusType</a>&nbsp;getStatus()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the status of the key. See <a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey"><code>KeyHandle.KeyStatusType</code></a>.</div>
 </li>
 </ul>
@@ -353,6 +371,7 @@
 <li class="blockList">
 <h4>getId</h4>
 <pre>public&nbsp;int&nbsp;getId()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the key ID of this key. The key ID is not guaranteed to be unique among all KeyHandles.</div>
 </li>
 </ul>
@@ -364,6 +383,7 @@
 <h4>getKey</h4>
 <pre>public&nbsp;<a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a>&nbsp;getKey(<a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a>&nbsp;access)
                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security">GeneralSecurityException</a></pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> key if <code>access</code> is a <a href="../../../../../com/google/crypto/tink/tinkkey/SecretKeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>SecretKeyAccess</code></a> and
  the key has a secret, or if the key does not have a secret, otherwise throws a <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security"><code>GeneralSecurityException</code></a>.</div>
 <dl>
@@ -379,6 +399,7 @@
 <li class="blockList">
 <h4>getKeyTemplate</h4>
 <pre>public&nbsp;<a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink">KeyTemplate</a>&nbsp;getKeyTemplate()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the <a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink"><code>KeyTemplate</code></a> of the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a>.</div>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/SecretKeyAccess.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/SecretKeyAccess.html
index 9d61f41..69c524e 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/SecretKeyAccess.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/SecretKeyAccess.html
@@ -17,8 +17,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":41};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -107,8 +107,12 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/InsecureSecretKeyAccess.html" title="class in com.google.crypto.tink"><code>InsecureSecretKeyAccess</code></a> instead.</span></div>
+</div>
 <br>
 <pre>@Immutable
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
 public final class <span class="typeNameLabel">SecretKeyAccess</span>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">A class used to generate <code>KeyAccess</code> instances granting secret access.
@@ -128,7 +132,7 @@
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -136,6 +140,7 @@
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/SecretKeyAccess.html#insecureSecretAccess--">insecureSecretAccess</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns a <code>KeyAccess</code> instance where <code>canAccessSecret()</code> returns true.</div>
 </td>
 </tr>
@@ -168,6 +173,7 @@
 <li class="blockList">
 <h4>insecureSecretAccess</h4>
 <pre>public static&nbsp;<a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a>&nbsp;insecureSecretAccess()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns a <code>KeyAccess</code> instance where <code>canAccessSecret()</code> returns true.</div>
 </li>
 </ul>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/TinkKey.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/TinkKey.html
index d4411e6..0cc4d46 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/TinkKey.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/TinkKey.html
@@ -17,8 +17,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var methods = {"i0":38,"i1":38};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -103,13 +103,17 @@
 <dd><a href="../../../../../com/google/crypto/tink/tinkkey/internal/ProtoKey.html" title="class in com.google.crypto.tink.tinkkey.internal">ProtoKey</a></dd>
 </dl>
 <hr>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
+</div>
 <br>
 <pre>@Immutable
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
 public interface <span class="typeNameLabel">TinkKey</span></pre>
 <div class="block"><code>TinkKey</code> represents how Tink views individual keys. In contrast, <code>KeysetHandle</code> only
  provides access to a <code>Keyset</code>, which represents multiple keys.
 
- <p> A <code>TinkKey</code> contains the data associated to a type of key and provides ways of getting
+ <p>A <code>TinkKey</code> contains the data associated to a type of key and provides ways of getting
  that data. The <code>TinkKey</code> interface does not specify how the key data is represented nor how
  it provides access to the data.</div>
 </li>
@@ -125,7 +129,7 @@
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -133,6 +137,7 @@
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink">KeyTemplate</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html#getKeyTemplate--">getKeyTemplate</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">A <code>TinkKey</code> should know the <code>KeyTemplate</code> from which it was generated,
  which in turn specifies the cryptographic algorithm in which the <code>TinkKey</code> should
  be used.</div>
@@ -141,6 +146,7 @@
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html#hasSecret--">hasSecret</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns true if the key contains secret key material, and false otherwise.</div>
 </td>
 </tr>
@@ -166,6 +172,7 @@
 <li class="blockList">
 <h4>hasSecret</h4>
 <pre>boolean&nbsp;hasSecret()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns true if the key contains secret key material, and false otherwise.</div>
 </li>
 </ul>
@@ -176,6 +183,7 @@
 <li class="blockList">
 <h4>getKeyTemplate</h4>
 <pre><a href="../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink">KeyTemplate</a>&nbsp;getKeyTemplate()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">A <code>TinkKey</code> should know the <code>KeyTemplate</code> from which it was generated,
  which in turn specifies the cryptographic algorithm in which the <code>TinkKey</code> should
  be used.
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyAccess.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyAccess.html
index 0461fd9..e03cf10 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyAccess.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyAccess.html
@@ -176,12 +176,14 @@
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a></code></td>
 <td class="colLast"><span class="typeNameLabel">SecretKeyAccess.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/tinkkey/SecretKeyAccess.html#insecureSecretAccess--">insecureSecretAccess</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns a <code>KeyAccess</code> instance where <code>canAccessSecret()</code> returns true.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a></code></td>
 <td class="colLast"><span class="typeNameLabel">KeyAccess.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html#publicAccess--">publicAccess</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns a <code>KeyAccess</code> instance where <code>canAccessSecret()</code> returns false.</div>
 </td>
 </tr>
@@ -198,6 +200,7 @@
 <td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></code></td>
 <td class="colLast"><span class="typeNameLabel">KeyHandle.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#createFromKey-com.google.crypto.tink.tinkkey.TinkKey-com.google.crypto.tink.tinkkey.KeyAccess-">createFromKey</a></span>(<a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a>&nbsp;key,
              <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a>&nbsp;access)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns a <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a> instance with <code>key</code> as the underlying <a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> if the
  caller provides the correct <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a> instance.</div>
 </td>
@@ -205,6 +208,7 @@
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a></code></td>
 <td class="colLast"><span class="typeNameLabel">KeyHandle.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#getKey-com.google.crypto.tink.tinkkey.KeyAccess-">getKey</a></span>(<a href="../../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a>&nbsp;access)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the underlying <a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> key if <code>access</code> is a <a href="../../../../../../com/google/crypto/tink/tinkkey/SecretKeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>SecretKeyAccess</code></a> and
  the key has a secret, or if the key does not have a secret, otherwise throws a <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security"><code>GeneralSecurityException</code></a>.</div>
 </td>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyHandle.KeyStatusType.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyHandle.KeyStatusType.html
index 9ab871a..78c35c0 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyHandle.KeyStatusType.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyHandle.KeyStatusType.html
@@ -143,6 +143,7 @@
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey">KeyHandle.KeyStatusType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">KeyHandle.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#getStatus--">getStatus</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the status of the key.</div>
 </td>
 </tr>
@@ -171,6 +172,7 @@
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#KeyHandle-com.google.crypto.tink.tinkkey.TinkKey-com.google.crypto.tink.tinkkey.KeyHandle.KeyStatusType-int-">KeyHandle</a></span>(<a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a>&nbsp;key,
          <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey">KeyHandle.KeyStatusType</a>&nbsp;status,
          int&nbsp;keyId)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Constructor intended for Tink internal purposes; allows one to set all the member variables of
  a <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a>.</div>
 </td>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyHandle.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyHandle.html
index 21e143c..51ed863 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyHandle.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/KeyHandle.html
@@ -194,6 +194,7 @@
 <td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></code></td>
 <td class="colLast"><span class="typeNameLabel">KeyHandle.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#createFromKey-com.google.crypto.tink.tinkkey.TinkKey-com.google.crypto.tink.tinkkey.KeyAccess-">createFromKey</a></span>(<a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a>&nbsp;key,
              <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a>&nbsp;access)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns a <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a> instance with <code>key</code> as the underlying <a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> if the
  caller provides the correct <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a> instance.</div>
 </td>
@@ -201,6 +202,7 @@
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></code></td>
 <td class="colLast"><span class="typeNameLabel">KeyHandle.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#generateNew-com.google.crypto.tink.KeyTemplate-">generateNew</a></span>(<a href="../../../../../../com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink">KeyTemplate</a>&nbsp;keyTemplate)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Generates a new <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a> that contains a fresh key generated according to <code>keyTemplate</code>.</div>
 </td>
 </tr>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/TinkKey.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/TinkKey.html
index 2fc7a85..cec05b2 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/TinkKey.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/class-use/TinkKey.html
@@ -108,6 +108,7 @@
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a></code></td>
 <td class="colLast"><span class="typeNameLabel">KeyHandle.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#getKey-com.google.crypto.tink.tinkkey.KeyAccess-">getKey</a></span>(<a href="../../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a>&nbsp;access)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns the underlying <a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> key if <code>access</code> is a <a href="../../../../../../com/google/crypto/tink/tinkkey/SecretKeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>SecretKeyAccess</code></a> and
  the key has a secret, or if the key does not have a secret, otherwise throws a <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security"><code>GeneralSecurityException</code></a>.</div>
 </td>
@@ -125,6 +126,7 @@
 <td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></code></td>
 <td class="colLast"><span class="typeNameLabel">KeyHandle.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#createFromKey-com.google.crypto.tink.tinkkey.TinkKey-com.google.crypto.tink.tinkkey.KeyAccess-">createFromKey</a></span>(<a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a>&nbsp;key,
              <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a>&nbsp;access)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Returns a <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a> instance with <code>key</code> as the underlying <a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> if the
  caller provides the correct <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a> instance.</div>
 </td>
@@ -141,6 +143,7 @@
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html#KeyHandle-com.google.crypto.tink.tinkkey.TinkKey-com.google.crypto.tink.tinkkey.KeyHandle.KeyStatusType-int-">KeyHandle</a></span>(<a href="../../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a>&nbsp;key,
          <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey">KeyHandle.KeyStatusType</a>&nbsp;status,
          int&nbsp;keyId)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">Constructor intended for Tink internal purposes; allows one to set all the member variables of
  a <a href="../../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a>.</div>
 </td>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/package-summary.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/package-summary.html
index 422dbff..fbe0e19 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/package-summary.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/package-summary.html
@@ -83,8 +83,8 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a></td>
-<td class="colLast">
-<div class="block"><code>TinkKey</code> represents how Tink views individual keys.</div>
+<td class="colLast">Deprecated
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
 </td>
 </tr>
 </tbody>
@@ -100,20 +100,20 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a></td>
-<td class="colLast">
-<div class="block">An access token for <code>TinkKey</code>.</div>
+<td class="colLast">Deprecated
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></td>
-<td class="colLast">
-<div class="block">Wraps a <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> and enforces access to the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> with <a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a>.</div>
+<td class="colLast">Deprecated
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a href="../../../../../com/google/crypto/tink/tinkkey/SecretKeyAccess.html" title="class in com.google.crypto.tink.tinkkey">SecretKeyAccess</a></td>
-<td class="colLast">
-<div class="block">A class used to generate <code>KeyAccess</code> instances granting secret access.</div>
+<td class="colLast">Deprecated
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/InsecureSecretKeyAccess.html" title="class in com.google.crypto.tink"><code>InsecureSecretKeyAccess</code></a> instead.</span></div>
 </td>
 </tr>
 </tbody>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/package-use.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/package-use.html
index 12885e0..3505ad0 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/package-use.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/tinkkey/package-use.html
@@ -115,12 +115,16 @@
 <tbody>
 <tr class="altColor">
 <td class="colOne"><a href="../../../../../com/google/crypto/tink/tinkkey/class-use/KeyAccess.html#com.google.crypto.tink">KeyAccess</a>
-<div class="block">An access token for <code>TinkKey</code>.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> instead.</span></div>
+</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../../../../com/google/crypto/tink/tinkkey/class-use/KeyHandle.html#com.google.crypto.tink">KeyHandle</a>
-<div class="block">Wraps a <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> and enforces access to the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> with <a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a>.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
+</div>
 </td>
 </tr>
 </tbody>
@@ -137,6 +141,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colOne"><a href="../../../../../com/google/crypto/tink/tinkkey/class-use/KeyHandle.KeyStatusType.html#com.google.crypto.tink.internal">KeyHandle.KeyStatusType</a>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">KeyStatusType is metadata associated to a key which is only meaningful when the key is part of
  a <code>Keyset</code>.</div>
 </td>
@@ -155,7 +160,9 @@
 <tbody>
 <tr class="altColor">
 <td class="colOne"><a href="../../../../../com/google/crypto/tink/tinkkey/class-use/KeyAccess.html#com.google.crypto.tink.jwt">KeyAccess</a>
-<div class="block">An access token for <code>TinkKey</code>.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> instead.</span></div>
+</div>
 </td>
 </tr>
 </tbody>
@@ -172,23 +179,30 @@
 <tbody>
 <tr class="altColor">
 <td class="colOne"><a href="../../../../../com/google/crypto/tink/tinkkey/class-use/KeyAccess.html#com.google.crypto.tink.tinkkey">KeyAccess</a>
-<div class="block">An access token for <code>TinkKey</code>.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> instead.</span></div>
+</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../../../../com/google/crypto/tink/tinkkey/class-use/KeyHandle.html#com.google.crypto.tink.tinkkey">KeyHandle</a>
-<div class="block">Wraps a <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> and enforces access to the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> with <a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a>.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
+</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colOne"><a href="../../../../../com/google/crypto/tink/tinkkey/class-use/KeyHandle.KeyStatusType.html#com.google.crypto.tink.tinkkey">KeyHandle.KeyStatusType</a>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block">KeyStatusType is metadata associated to a key which is only meaningful when the key is part of
  a <code>Keyset</code>.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../../../../com/google/crypto/tink/tinkkey/class-use/TinkKey.html#com.google.crypto.tink.tinkkey">TinkKey</a>
-<div class="block"><code>TinkKey</code> represents how Tink views individual keys.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
+</div>
 </td>
 </tr>
 </tbody>
@@ -205,12 +219,16 @@
 <tbody>
 <tr class="altColor">
 <td class="colOne"><a href="../../../../../com/google/crypto/tink/tinkkey/class-use/KeyHandle.html#com.google.crypto.tink.tinkkey.internal">KeyHandle</a>
-<div class="block">Wraps a <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> and enforces access to the underlying <a href="../../../../../com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> with <a href="../../../../../com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a>.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
+</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../../../../com/google/crypto/tink/tinkkey/class-use/TinkKey.html#com.google.crypto.tink.tinkkey.internal">TinkKey</a>
-<div class="block"><code>TinkKey</code> represents how Tink views individual keys.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
+</div>
 </td>
 </tr>
 </tbody>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/class-use/Bytes.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/class-use/Bytes.html
index 6cf582c..c48178b 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/class-use/Bytes.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/class-use/Bytes.html
@@ -118,6 +118,10 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/util/Bytes.html" title="class in com.google.crypto.tink.util">Bytes</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxKey.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html#getOutputPrefix--">getOutputPrefix</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>abstract <a href="../../../../../../com/google/crypto/tink/util/Bytes.html" title="class in com.google.crypto.tink.util">Bytes</a></code></td>
 <td class="colLast"><span class="typeNameLabel">AeadKey.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AeadKey.html#getOutputPrefix--">getOutputPrefix</a></span>()</code>
 <div class="block">Returns a <a href="../../../../../../com/google/crypto/tink/util/Bytes.html" title="class in com.google.crypto.tink.util"><code>Bytes</code></a> instance which is prefixed to the ciphertext.</div>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/class-use/SecretBytes.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/class-use/SecretBytes.html
index 50a3a62..e89daeb 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/class-use/SecretBytes.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/class-use/SecretBytes.html
@@ -82,10 +82,14 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="#com.google.crypto.tink.mac">com.google.crypto.tink.mac</a></td>
+<td class="colFirst"><a href="#com.google.crypto.tink.aead">com.google.crypto.tink.aead</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="#com.google.crypto.tink.mac">com.google.crypto.tink.mac</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="#com.google.crypto.tink.util">com.google.crypto.tink.util</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -94,6 +98,39 @@
 </li>
 <li class="blockList">
 <ul class="blockList">
+<li class="blockList"><a name="com.google.crypto.tink.aead">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../com/google/crypto/tink/util/SecretBytes.html" title="class in com.google.crypto.tink.util">SecretBytes</a> in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> that return <a href="../../../../../../com/google/crypto/tink/util/SecretBytes.html" title="class in com.google.crypto.tink.util">SecretBytes</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/util/SecretBytes.html" title="class in com.google.crypto.tink.util">SecretBytes</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxKey.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.html#getKeyBytes--">getKeyBytes</a></span>()</code>
+<div class="block">Returns the underlying key bytes.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a> with parameters of type <a href="../../../../../../com/google/crypto/tink/util/SecretBytes.html" title="class in com.google.crypto.tink.util">SecretBytes</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AesEaxKey.Builder.</span><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/aead/AesEaxKey.Builder.html#setKeyBytes-com.google.crypto.tink.util.SecretBytes-">setKeyBytes</a></span>(<a href="../../../../../../com/google/crypto/tink/util/SecretBytes.html" title="class in com.google.crypto.tink.util">SecretBytes</a>&nbsp;keyBytes)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
 <li class="blockList"><a name="com.google.crypto.tink.mac">
 <!--   -->
 </a>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/package-use.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/package-use.html
index cf1ec50..3dcd999 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/package-use.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/util/package-use.html
@@ -118,6 +118,11 @@
 <div class="block">Immutable Wrapper around a byte array.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../com/google/crypto/tink/util/class-use/SecretBytes.html#com.google.crypto.tink.aead">SecretBytes</a>
+<div class="block">A class storing an immutable byte array, protecting the data via <a href="../../../../../com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a>.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/deprecated-list.html b/javadoc/tink/HEAD-SNAPSHOT/deprecated-list.html
index 63d5a0a..5616eac 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/deprecated-list.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/deprecated-list.html
@@ -101,6 +101,11 @@
 <tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/RegistryConfigOrBuilder.html" title="interface in com.google.crypto.tink.proto">com.google.crypto.tink.proto.RegistryConfigOrBuilder</a></td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a href="com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">com.google.crypto.tink.tinkkey.TinkKey</a>
+<div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -168,6 +173,16 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">com.google.crypto.tink.tinkkey.KeyAccess</a>
+<div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> instead.</span></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">com.google.crypto.tink.tinkkey.KeyHandle</a>
+<div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/KeyTypeEntry.html" title="class in com.google.crypto.tink.proto">com.google.crypto.tink.proto.KeyTypeEntry</a></td>
 </tr>
 <tr class="altColor">
@@ -218,24 +233,29 @@
 <td class="colOne"><a href="com/google/crypto/tink/proto/RegistryConfig.html" title="class in com.google.crypto.tink.proto">com.google.crypto.tink.proto.RegistryConfig</a></td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="com/google/crypto/tink/tinkkey/SecretKeyAccess.html" title="class in com.google.crypto.tink.tinkkey">com.google.crypto.tink.tinkkey.SecretKeyAccess</a>
+<div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/InsecureSecretKeyAccess.html" title="class in com.google.crypto.tink"><code>InsecureSecretKeyAccess</code></a> instead.</span></div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/SignatureKeyTemplates.html" title="class in com.google.crypto.tink.signature">com.google.crypto.tink.signature.SignatureKeyTemplates</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/KeyTemplates.html#get-java.lang.String-"><code>KeyTemplates.get(java.lang.String)</code></a>, e.g.,
      KeyTemplates.get("ECDSA_P256")</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/streamingaead/StreamingAeadFactory.html" title="class in com.google.crypto.tink.streamingaead">com.google.crypto.tink.streamingaead.StreamingAeadFactory</a>
 <div class="block"><span class="deprecationComment">Use <code>keysetHandle.GetPrimitive(StreamingAead.class)</code> after registering the
      <code>StreamingAeadWrapper</code> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/streamingaead/StreamingAeadKeyTemplates.html" title="class in com.google.crypto.tink.streamingaead">com.google.crypto.tink.streamingaead.StreamingAeadKeyTemplates</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/KeyTemplates.html#get-java.lang.String-"><code>KeyTemplates.get(java.lang.String)</code></a>, e.g.,
      KeyTemplates.get("AES256_GCM_HKDF_1MB")</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/config/TinkConfig.html" title="class in com.google.crypto.tink.config">com.google.crypto.tink.config.TinkConfig</a>
 <div class="block"><span class="deprecationComment">Use per-primitive configs, e.g., <code>AeadConfig</code>, <a href="com/google/crypto/tink/hybrid/HybridConfig.html" title="class in com.google.crypto.tink.hybrid"><code>HybridConfig</code></a>, etc.</span></div>
 </td>
@@ -279,49 +299,49 @@
 <td class="colOne"><a href="com/google/crypto/tink/hybrid/HybridConfig.html#LATEST">com.google.crypto.tink.hybrid.HybridConfig.LATEST</a>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="com/google/crypto/tink/aead/AeadConfig.html#LATEST">com.google.crypto.tink.aead.AeadConfig.LATEST</a>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/aead/AeadConfig.html#register--"><code>AeadConfig.register()</code></a></span></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="com/google/crypto/tink/mac/MacConfig.html#LATEST">com.google.crypto.tink.mac.MacConfig.LATEST</a>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/mac/MacConfig.html#register--"><code>MacConfig.register()</code></a></span></div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/config/TinkConfig.html#LATEST">com.google.crypto.tink.config.TinkConfig.LATEST</a>
 <div class="block"><span class="deprecationComment">This is not supported anymore.</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="com/google/crypto/tink/aead/AeadConfig.html#LATEST">com.google.crypto.tink.aead.AeadConfig.LATEST</a>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/aead/AeadConfig.html#register--"><code>AeadConfig.register()</code></a></span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="com/google/crypto/tink/mac/MacConfig.html#LATEST">com.google.crypto.tink.mac.MacConfig.LATEST</a>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/mac/MacConfig.html#register--"><code>MacConfig.register()</code></a></span></div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#LATEST">com.google.crypto.tink.daead.DeterministicAeadConfig.LATEST</a>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>DeterministicAeadConfig.register()</code></a></span></div>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>register()</code></a></span></div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/hybrid/HybridConfig.html#TINK_1_0_0">com.google.crypto.tink.hybrid.HybridConfig.TINK_1_0_0</a>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="com/google/crypto/tink/config/TinkConfig.html#TINK_1_0_0">com.google.crypto.tink.config.TinkConfig.TINK_1_0_0</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/AeadConfig.html#TINK_1_0_0">com.google.crypto.tink.aead.AeadConfig.TINK_1_0_0</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/aead/AeadConfig.html#register--"><code>AeadConfig.register()</code></a></span></div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a href="com/google/crypto/tink/signature/SignatureConfig.html#TINK_1_0_0">com.google.crypto.tink.signature.SignatureConfig.TINK_1_0_0</a>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/mac/MacConfig.html#TINK_1_0_0">com.google.crypto.tink.mac.MacConfig.TINK_1_0_0</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/mac/MacConfig.html#register--"><code>MacConfig.register()</code></a></span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="com/google/crypto/tink/signature/SignatureConfig.html#TINK_1_0_0">com.google.crypto.tink.signature.SignatureConfig.TINK_1_0_0</a>&nbsp;</td>
+<td class="colOne"><a href="com/google/crypto/tink/config/TinkConfig.html#TINK_1_0_0">com.google.crypto.tink.config.TinkConfig.TINK_1_0_0</a>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="com/google/crypto/tink/hybrid/HybridConfig.html#TINK_1_1_0">com.google.crypto.tink.hybrid.HybridConfig.TINK_1_1_0</a>&nbsp;</td>
+<td class="colOne"><a href="com/google/crypto/tink/streamingaead/StreamingAeadConfig.html#TINK_1_1_0">com.google.crypto.tink.streamingaead.StreamingAeadConfig.TINK_1_1_0</a>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="com/google/crypto/tink/config/TinkConfig.html#TINK_1_1_0">com.google.crypto.tink.config.TinkConfig.TINK_1_1_0</a>&nbsp;</td>
+<td class="colOne"><a href="com/google/crypto/tink/hybrid/HybridConfig.html#TINK_1_1_0">com.google.crypto.tink.hybrid.HybridConfig.TINK_1_1_0</a>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/AeadConfig.html#TINK_1_1_0">com.google.crypto.tink.aead.AeadConfig.TINK_1_1_0</a>
@@ -329,7 +349,7 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="com/google/crypto/tink/streamingaead/StreamingAeadConfig.html#TINK_1_1_0">com.google.crypto.tink.streamingaead.StreamingAeadConfig.TINK_1_1_0</a>&nbsp;</td>
+<td class="colOne"><a href="com/google/crypto/tink/signature/SignatureConfig.html#TINK_1_1_0">com.google.crypto.tink.signature.SignatureConfig.TINK_1_1_0</a>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/mac/MacConfig.html#TINK_1_1_0">com.google.crypto.tink.mac.MacConfig.TINK_1_1_0</a>
@@ -337,12 +357,12 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#TINK_1_1_0">com.google.crypto.tink.daead.DeterministicAeadConfig.TINK_1_1_0</a>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>DeterministicAeadConfig.register()</code></a></span></div>
-</td>
+<td class="colOne"><a href="com/google/crypto/tink/config/TinkConfig.html#TINK_1_1_0">com.google.crypto.tink.config.TinkConfig.TINK_1_1_0</a>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="com/google/crypto/tink/signature/SignatureConfig.html#TINK_1_1_0">com.google.crypto.tink.signature.SignatureConfig.TINK_1_1_0</a>&nbsp;</td>
+<td class="colOne"><a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#TINK_1_1_0">com.google.crypto.tink.daead.DeterministicAeadConfig.TINK_1_1_0</a>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>register()</code></a></span></div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -428,13 +448,13 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="com/google/crypto/tink/mac/AesCmacKeyManager.html#aes256CmacTemplate--">com.google.crypto.tink.mac.AesCmacKeyManager.aes256CmacTemplate()</a>
-<div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES256_CMAC")</code></span></div>
+<td class="colOne"><a href="com/google/crypto/tink/prf/AesCmacPrfKeyManager.html#aes256CmacTemplate--">com.google.crypto.tink.prf.AesCmacPrfKeyManager.aes256CmacTemplate()</a>
+<div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES256_CMAC_PRF")</code></span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="com/google/crypto/tink/prf/AesCmacPrfKeyManager.html#aes256CmacTemplate--">com.google.crypto.tink.prf.AesCmacPrfKeyManager.aes256CmacTemplate()</a>
-<div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES256_CMAC_PRF")</code></span></div>
+<td class="colOne"><a href="com/google/crypto/tink/mac/AesCmacKeyManager.html#aes256CmacTemplate--">com.google.crypto.tink.mac.AesCmacKeyManager.aes256CmacTemplate()</a>
+<div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES256_CMAC")</code></span></div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -488,160 +508,158 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="com/google/crypto/tink/subtle/SubtleUtil.html#bytes2Integer-byte:A-">com.google.crypto.tink.subtle.SubtleUtil.bytes2Integer(byte[])</a></td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/ChaCha20Poly1305KeyManager.html#chaCha20Poly1305Template--">com.google.crypto.tink.aead.ChaCha20Poly1305KeyManager.chaCha20Poly1305Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("CHACHA20_POLY1305")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/tinkkey/KeyHandle.html#createFromKey-com.google.crypto.tink.proto.KeyData-com.google.crypto.tink.KeyTemplate.OutputPrefixType-">com.google.crypto.tink.tinkkey.KeyHandle.createFromKey(KeyData, KeyTemplate.OutputPrefixType)</a>
 <div class="block"><span class="deprecationComment">Use the KeyHandle(TinkKey, KeyAccess) constructor instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/KeysetHandle.html#createFromKey-com.google.crypto.tink.tinkkey.KeyHandle-com.google.crypto.tink.tinkkey.KeyAccess-">com.google.crypto.tink.KeysetHandle.createFromKey(KeyHandle, KeyAccess)</a>
 <div class="block"><span class="deprecationComment">Use <code>KeysetHandle.Builder.addEntry</code> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/EcdsaSignKeyManager.html#ecdsaP256Template--">com.google.crypto.tink.signature.EcdsaSignKeyManager.ecdsaP256Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("ECDSA_P256")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/hybrid/EciesAeadHkdfPrivateKeyManager.html#eciesP256HkdfHmacSha256Aes128CtrHmacSha256Template--">com.google.crypto.tink.hybrid.EciesAeadHkdfPrivateKeyManager.eciesP256HkdfHmacSha256Aes128CtrHmacSha256Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("ECIES_P256_HKDF_HMAC_SHA256_AES128_CTR_HMAC_SHA256")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/hybrid/EciesAeadHkdfPrivateKeyManager.html#eciesP256HkdfHmacSha256Aes128GcmTemplate--">com.google.crypto.tink.hybrid.EciesAeadHkdfPrivateKeyManager.eciesP256HkdfHmacSha256Aes128GcmTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("ECIES_P256_HKDF_HMAC_SHA256_AES128_GCM")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/subtle/EllipticCurves.html#ecPointDecode-java.security.spec.EllipticCurve-com.google.crypto.tink.subtle.EllipticCurves.PointFormatType-byte:A-">com.google.crypto.tink.subtle.EllipticCurves.ecPointDecode(EllipticCurve, EllipticCurves.PointFormatType, byte[])</a>
 <div class="block"><span class="deprecationComment">use {#pointDecode}</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/Ed25519PrivateKeyManager.html#ed25519Template--">com.google.crypto.tink.signature.Ed25519PrivateKeyManager.ed25519Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("ED25519")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/jwt/JwkSetConverter.html#fromKeysetHandle-com.google.crypto.tink.KeysetHandle-com.google.crypto.tink.tinkkey.KeyAccess-">com.google.crypto.tink.jwt.JwkSetConverter.fromKeysetHandle(KeysetHandle, KeyAccess)</a>
 <div class="block"><span class="deprecationComment">Use JwkSetConverter.fromPublicKeysetHandle(handle) instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/KeysetHandle.html#generateNew-com.google.crypto.tink.proto.KeyTemplate-">com.google.crypto.tink.KeysetHandle.generateNew(KeyTemplate)</a>
 <div class="block"><span class="deprecationComment">This method takes a KeyTemplate proto, which is an internal implementation detail.
      Please use the generateNew method that takes a <a href="com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink"><code>KeyTemplate</code></a> POJO.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/Registry.html#getCatalogue-java.lang.String-">com.google.crypto.tink.Registry.getCatalogue(String)</a>
 <div class="block"><span class="deprecationComment">Catalogues are no longer supported.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/Registry.html#getKeyManager-java.lang.String-">com.google.crypto.tink.Registry.getKeyManager(String)</a>
 <div class="block"><span class="deprecationComment">Use <code>getKeyManager(typeUrl, Primitive.class)</code> or <code>getUntypedKeyManager
      typeUrl</code> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/KeysetHandle.html#getKeys--">com.google.crypto.tink.KeysetHandle.getKeys()</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/KeysetHandle.html#size--"><code>KeysetHandle.size()</code></a> and <a href="com/google/crypto/tink/KeysetHandle.html#getAt-int-"><code>KeysetHandle.getAt(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/Registry.html#getPrimitive-com.google.crypto.tink.proto.KeyData-">com.google.crypto.tink.Registry.getPrimitive(KeyData)</a>
 <div class="block"><span class="deprecationComment">Use <code>getPrimitive(keyData, Primitive.class)</code> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/hybrid/HybridEncryptFactory.html#getPrimitive-com.google.crypto.tink.KeysetHandle-">com.google.crypto.tink.hybrid.HybridEncryptFactory.getPrimitive(KeysetHandle)</a>
 <div class="block"><span class="deprecationComment">Use <code>keysetHandle.GetPrimitive(HybridEncrypt.class)</code> after registering the
      <code>HybridEncryptWrapper</code> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/hybrid/HybridDecryptFactory.html#getPrimitive-com.google.crypto.tink.KeysetHandle-">com.google.crypto.tink.hybrid.HybridDecryptFactory.getPrimitive(KeysetHandle)</a>
 <div class="block"><span class="deprecationComment">Use <code>keysetHandle.GetPrimitive(HybridDecrypt.class)</code> after registering the
      <code>HybridDecryptWrapper</code> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/AeadFactory.html#getPrimitive-com.google.crypto.tink.KeysetHandle-">com.google.crypto.tink.aead.AeadFactory.getPrimitive(KeysetHandle)</a>
 <div class="block"><span class="deprecationComment">Use <code>keysetHandle.GetPrimitive(Aead.class)</code> after registering the <code>AeadWrapper</code> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colOne"><a href="com/google/crypto/tink/mac/MacFactory.html#getPrimitive-com.google.crypto.tink.KeysetHandle-">com.google.crypto.tink.mac.MacFactory.getPrimitive(KeysetHandle)</a>
-<div class="block"><span class="deprecationComment">Use <code>keysetHandle.GetPrimitive(Mac.class)</code> after registering the <code>MacWrapper</code> instead.</span></div>
-</td>
-</tr>
 <tr class="rowColor">
-<td class="colOne"><a href="com/google/crypto/tink/daead/DeterministicAeadFactory.html#getPrimitive-com.google.crypto.tink.KeysetHandle-">com.google.crypto.tink.daead.DeterministicAeadFactory.getPrimitive(KeysetHandle)</a>
-<div class="block"><span class="deprecationComment">Use <code>keysetHandle.GetPrimitive(DeterministicAead.class)</code> after registering
-     the <code>DeterministicAeadWrapper</code> instead.</span></div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/PublicKeyVerifyFactory.html#getPrimitive-com.google.crypto.tink.KeysetHandle-">com.google.crypto.tink.signature.PublicKeyVerifyFactory.getPrimitive(KeysetHandle)</a>
 <div class="block"><span class="deprecationComment">Use <code>keysetHandle.GetPrimitive(PublicKeyVerify.class)</code> after registering the
      <code>PublicKeyVerifyWrapper</code> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/PublicKeySignFactory.html#getPrimitive-com.google.crypto.tink.KeysetHandle-">com.google.crypto.tink.signature.PublicKeySignFactory.getPrimitive(KeysetHandle)</a>
 <div class="block"><span class="deprecationComment">Use <code>keysetHandle.GetPrimitive(PublicKeySign.class)</code> after registering the
      <code>PublicKeySignWrapper</code> instead.</span></div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a href="com/google/crypto/tink/mac/MacFactory.html#getPrimitive-com.google.crypto.tink.KeysetHandle-">com.google.crypto.tink.mac.MacFactory.getPrimitive(KeysetHandle)</a>
+<div class="block"><span class="deprecationComment">Use <code>keysetHandle.GetPrimitive(Mac.class)</code> after registering the <code>MacWrapper</code> instead.</span></div>
+</td>
+</tr>
 <tr class="altColor">
+<td class="colOne"><a href="com/google/crypto/tink/daead/DeterministicAeadFactory.html#getPrimitive-com.google.crypto.tink.KeysetHandle-">com.google.crypto.tink.daead.DeterministicAeadFactory.getPrimitive(KeysetHandle)</a>
+<div class="block"><span class="deprecationComment">Use <code>keysetHandle.GetPrimitive(DeterministicAead.class)</code> after registering
+     the <code>DeterministicAeadWrapper</code> instead.</span></div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/Registry.html#getPrimitive-java.lang.String-byte:A-">com.google.crypto.tink.Registry.getPrimitive(String, byte[])</a>
 <div class="block"><span class="deprecationComment">Use <code>getPrimitive(typeUrl, serializedKey, Primitive.class)</code> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/Registry.html#getPrimitive-java.lang.String-com.google.protobuf.ByteString-">com.google.crypto.tink.Registry.getPrimitive(String, ByteString)</a>
 <div class="block"><span class="deprecationComment">Use <code>getPrimitive(typeUrl, serializedKey, Primitive.class</code> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/Registry.html#getPrimitive-java.lang.String-com.google.protobuf.MessageLite-">com.google.crypto.tink.Registry.getPrimitive(String, MessageLite)</a>
 <div class="block"><span class="deprecationComment">Use <code>getPrimitive(typeUrl, key, P.class)</code> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/prf/HkdfPrfKeyManager.html#hkdfSha256Template--">com.google.crypto.tink.prf.HkdfPrfKeyManager.hkdfSha256Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("HKDF_SHA256")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/mac/HmacKeyManager.html#hmacSha256HalfDigestTemplate--">com.google.crypto.tink.mac.HmacKeyManager.hmacSha256HalfDigestTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("HMAC_SHA256_128BITTAG")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colOne"><a href="com/google/crypto/tink/mac/HmacKeyManager.html#hmacSha256Template--">com.google.crypto.tink.mac.HmacKeyManager.hmacSha256Template()</a>
-<div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("HMAC_SHA256_256BITTAG")</code></span></div>
-</td>
-</tr>
 <tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/prf/HmacPrfKeyManager.html#hmacSha256Template--">com.google.crypto.tink.prf.HmacPrfKeyManager.hmacSha256Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("HMAC_SHA256_PRF")</code></span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="com/google/crypto/tink/mac/HmacKeyManager.html#hmacSha512HalfDigestTemplate--">com.google.crypto.tink.mac.HmacKeyManager.hmacSha512HalfDigestTemplate()</a>
-<div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("HMAC_SHA512_256BITTAG")</code></span></div>
+<td class="colOne"><a href="com/google/crypto/tink/mac/HmacKeyManager.html#hmacSha256Template--">com.google.crypto.tink.mac.HmacKeyManager.hmacSha256Template()</a>
+<div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("HMAC_SHA256_256BITTAG")</code></span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="com/google/crypto/tink/mac/HmacKeyManager.html#hmacSha512Template--">com.google.crypto.tink.mac.HmacKeyManager.hmacSha512Template()</a>
-<div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("HMAC_SHA512_512BITTAG")</code></span></div>
+<td class="colOne"><a href="com/google/crypto/tink/mac/HmacKeyManager.html#hmacSha512HalfDigestTemplate--">com.google.crypto.tink.mac.HmacKeyManager.hmacSha512HalfDigestTemplate()</a>
+<div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("HMAC_SHA512_256BITTAG")</code></span></div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -650,18 +668,8 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="com/google/crypto/tink/hybrid/HybridConfig.html#init--">com.google.crypto.tink.hybrid.HybridConfig.init()</a>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/hybrid/HybridConfig.html#register--"><code>HybridConfig.register()</code></a></span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="com/google/crypto/tink/config/TinkConfig.html#init--">com.google.crypto.tink.config.TinkConfig.init()</a>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/config/TinkConfig.html#register--"><code>TinkConfig.register()</code></a></span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="com/google/crypto/tink/aead/AeadConfig.html#init--">com.google.crypto.tink.aead.AeadConfig.init()</a>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/aead/AeadConfig.html#register--"><code>AeadConfig.register()</code></a></span></div>
+<td class="colOne"><a href="com/google/crypto/tink/mac/HmacKeyManager.html#hmacSha512Template--">com.google.crypto.tink.mac.HmacKeyManager.hmacSha512Template()</a>
+<div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("HMAC_SHA512_512BITTAG")</code></span></div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -670,13 +678,13 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="com/google/crypto/tink/mac/MacConfig.html#init--">com.google.crypto.tink.mac.MacConfig.init()</a>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/mac/MacConfig.html#register--"><code>MacConfig.register()</code></a></span></div>
+<td class="colOne"><a href="com/google/crypto/tink/hybrid/HybridConfig.html#init--">com.google.crypto.tink.hybrid.HybridConfig.init()</a>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/hybrid/HybridConfig.html#register--"><code>HybridConfig.register()</code></a></span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#init--">com.google.crypto.tink.daead.DeterministicAeadConfig.init()</a>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>DeterministicAeadConfig.register()</code></a></span></div>
+<td class="colOne"><a href="com/google/crypto/tink/aead/AeadConfig.html#init--">com.google.crypto.tink.aead.AeadConfig.init()</a>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/aead/AeadConfig.html#register--"><code>AeadConfig.register()</code></a></span></div>
 </td>
 </tr>
 <tr class="altColor">
@@ -685,155 +693,165 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="com/google/crypto/tink/mac/MacConfig.html#init--">com.google.crypto.tink.mac.MacConfig.init()</a>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/mac/MacConfig.html#register--"><code>MacConfig.register()</code></a></span></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="com/google/crypto/tink/config/TinkConfig.html#init--">com.google.crypto.tink.config.TinkConfig.init()</a>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/config/TinkConfig.html#register--"><code>TinkConfig.register()</code></a></span></div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#init--">com.google.crypto.tink.daead.DeterministicAeadConfig.init()</a>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>register()</code></a></span></div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/PrimitiveSet.html#newPrimitiveSet-java.lang.Class-">com.google.crypto.tink.PrimitiveSet.newPrimitiveSet(Class&lt;P&gt;)</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/PrimitiveSet.Builder.html" title="class in com.google.crypto.tink"><code>PrimitiveSet.Builder</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/NoSecretKeysetHandle.html#parseFrom-byte:A-">com.google.crypto.tink.NoSecretKeysetHandle.parseFrom(byte[])</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/NoSecretKeysetHandle.html#read-com.google.crypto.tink.KeysetReader-"><code>NoSecretKeysetHandle.read(com.google.crypto.tink.KeysetReader)</code></a> instead</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/CleartextKeysetHandle.html#parseFrom-byte:A-">com.google.crypto.tink.CleartextKeysetHandle.parseFrom(byte[])</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/CleartextKeysetHandle.html#read-com.google.crypto.tink.KeysetReader-"><code>CleartextKeysetHandle.read(com.google.crypto.tink.KeysetReader)</code></a> instead</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/KeysetHandle.html#primaryKey--">com.google.crypto.tink.KeysetHandle.primaryKey()</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/KeysetHandle.html#getPrimary--"><code>KeysetHandle.getPrimary()</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/KeysetManager.html#promote-int-">com.google.crypto.tink.KeysetManager.promote(int)</a>
 <div class="block"><span class="deprecationComment">use <code>setPrimary</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/AesEaxKeyManager.html#rawAes128EaxTemplate--">com.google.crypto.tink.aead.AesEaxKeyManager.rawAes128EaxTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES128_EAX_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/AesGcmSivKeyManager.html#rawAes128GcmSivTemplate--">com.google.crypto.tink.aead.AesGcmSivKeyManager.rawAes128GcmSivTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES128_GCM_SIV_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/AesGcmKeyManager.html#rawAes128GcmTemplate--">com.google.crypto.tink.aead.AesGcmKeyManager.rawAes128GcmTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES128_GCM_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/mac/AesCmacKeyManager.html#rawAes256CmacTemplate--">com.google.crypto.tink.mac.AesCmacKeyManager.rawAes256CmacTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES256_CMAC_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/AesEaxKeyManager.html#rawAes256EaxTemplate--">com.google.crypto.tink.aead.AesEaxKeyManager.rawAes256EaxTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES256_EAX_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/AesGcmSivKeyManager.html#rawAes256GcmSivTemplate--">com.google.crypto.tink.aead.AesGcmSivKeyManager.rawAes256GcmSivTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES256_GCM_SIV_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/AesGcmKeyManager.html#rawAes256GcmTemplate--">com.google.crypto.tink.aead.AesGcmKeyManager.rawAes256GcmTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES256_GCM_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/daead/AesSivKeyManager.html#rawAes256SivTemplate--">com.google.crypto.tink.daead.AesSivKeyManager.rawAes256SivTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("AES256_SIV_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/ChaCha20Poly1305KeyManager.html#rawChaCha20Poly1305Template--">com.google.crypto.tink.aead.ChaCha20Poly1305KeyManager.rawChaCha20Poly1305Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("CHACHA20_POLY1305_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/EcdsaSignKeyManager.html#rawEcdsaP256Template--">com.google.crypto.tink.signature.EcdsaSignKeyManager.rawEcdsaP256Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("ECDSA_P256_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/hybrid/EciesAeadHkdfPrivateKeyManager.html#rawEciesP256HkdfHmacSha256Aes128CtrHmacSha256CompressedTemplate--">com.google.crypto.tink.hybrid.EciesAeadHkdfPrivateKeyManager.rawEciesP256HkdfHmacSha256Aes128CtrHmacSha256CompressedTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("ECIES_P256_COMPRESSED_HKDF_HMAC_SHA256_AES128_CTR_HMAC_SHA256_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/hybrid/EciesAeadHkdfPrivateKeyManager.html#rawEciesP256HkdfHmacSha256Aes128GcmCompressedTemplate--">com.google.crypto.tink.hybrid.EciesAeadHkdfPrivateKeyManager.rawEciesP256HkdfHmacSha256Aes128GcmCompressedTemplate()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("ECIES_P256_COMPRESSED_HKDF_HMAC_SHA256_AES128_GCM_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/Ed25519PrivateKeyManager.html#rawEd25519Template--">com.google.crypto.tink.signature.Ed25519PrivateKeyManager.rawEd25519Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("ED25519_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/RsaSsaPssSignKeyManager.html#rawRsa3072PssSha256F4Template--">com.google.crypto.tink.signature.RsaSsaPssSignKeyManager.rawRsa3072PssSha256F4Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("RSA_SSA_PSS_3072_SHA256_F4_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/RsaSsaPkcs1SignKeyManager.html#rawRsa3072SsaPkcs1Sha256F4Template--">com.google.crypto.tink.signature.RsaSsaPkcs1SignKeyManager.rawRsa3072SsaPkcs1Sha256F4Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("RSA_SSA_PKCS1_3072_SHA256_F4_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/RsaSsaPssSignKeyManager.html#rawRsa4096PssSha512F4Template--">com.google.crypto.tink.signature.RsaSsaPssSignKeyManager.rawRsa4096PssSha512F4Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("RSA_SSA_PSS_4096_SHA512_F4_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/RsaSsaPkcs1SignKeyManager.html#rawRsa4096SsaPkcs1Sha512F4Template--">com.google.crypto.tink.signature.RsaSsaPkcs1SignKeyManager.rawRsa4096SsaPkcs1Sha512F4Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("RSA_SSA_PKCS1_4096_SHA512_F4_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/XChaCha20Poly1305KeyManager.html#rawXChaCha20Poly1305Template--">com.google.crypto.tink.aead.XChaCha20Poly1305KeyManager.rawXChaCha20Poly1305Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("XCHACHA20_POLY1305_RAW")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/KeysetHandle.html#readNoSecret-byte:A-">com.google.crypto.tink.KeysetHandle.readNoSecret(byte[])</a>
 <div class="block"><span class="deprecationComment">Use <code>TinkProtoKeysetFormat.parseKeysetWithoutSecret(serialized)</code> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/Registry.html#registerKeyManager-java.lang.String-com.google.crypto.tink.KeyManager-">com.google.crypto.tink.Registry.registerKeyManager(String, KeyManager&lt;P&gt;)</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/Registry.html#registerKeyManager-com.google.crypto.tink.KeyManager-"><code>registerKeyManager(KeyManager&lt;P&gt;)</code></a></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/Registry.html#registerKeyManager-java.lang.String-com.google.crypto.tink.KeyManager-boolean-">com.google.crypto.tink.Registry.registerKeyManager(String, KeyManager&lt;P&gt;, boolean)</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/Registry.html#registerKeyManager-com.google.crypto.tink.KeyManager-boolean-"><code>registerKeyManager(KeyManager&lt;P&gt;, boolean)</code></a></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/hybrid/HybridEncryptConfig.html#registerStandardKeyTypes--">com.google.crypto.tink.hybrid.HybridEncryptConfig.registerStandardKeyTypes()</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/Config.html#register-com.google.crypto.tink.proto.RegistryConfig-"><code>Config.register(com.google.crypto.tink.proto.RegistryConfig)</code></a></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/hybrid/HybridDecryptConfig.html#registerStandardKeyTypes--">com.google.crypto.tink.hybrid.HybridDecryptConfig.registerStandardKeyTypes()</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/Config.html#register-com.google.crypto.tink.proto.RegistryConfig-"><code>Config.register(com.google.crypto.tink.proto.RegistryConfig)</code></a></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/AeadConfig.html#registerStandardKeyTypes--">com.google.crypto.tink.aead.AeadConfig.registerStandardKeyTypes()</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/aead/AeadConfig.html#register--"><code>AeadConfig.register()</code></a></span></div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colOne"><a href="com/google/crypto/tink/mac/MacConfig.html#registerStandardKeyTypes--">com.google.crypto.tink.mac.MacConfig.registerStandardKeyTypes()</a>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/mac/MacConfig.html#register--"><code>MacConfig.register()</code></a></span></div>
-</td>
-</tr>
 <tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/PublicKeyVerifyConfig.html#registerStandardKeyTypes--">com.google.crypto.tink.signature.PublicKeyVerifyConfig.registerStandardKeyTypes()</a>
 <div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/Config.html#register-com.google.crypto.tink.proto.RegistryConfig-"><code>Config.register(com.google.crypto.tink.proto.RegistryConfig)</code></a></span></div>
@@ -845,147 +863,152 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="com/google/crypto/tink/mac/MacConfig.html#registerStandardKeyTypes--">com.google.crypto.tink.mac.MacConfig.registerStandardKeyTypes()</a>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/mac/MacConfig.html#register--"><code>MacConfig.register()</code></a></span></div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/KeysetHandle.Builder.html#removeAt-int-">com.google.crypto.tink.KeysetHandle.Builder.removeAt(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/KeysetHandle.Builder.html#deleteAt-int-"><code>KeysetHandle.Builder.deleteAt(int)</code></a> or <a href="com/google/crypto/tink/KeysetHandle.Builder.html#getAt-int-"><code>KeysetHandle.Builder.getAt(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/KeysetManager.html#rotate-com.google.crypto.tink.proto.KeyTemplate-">com.google.crypto.tink.KeysetManager.rotate(KeyTemplate)</a>
 <div class="block"><span class="deprecationComment">Please use <a href="com/google/crypto/tink/KeysetManager.html#add-com.google.crypto.tink.proto.KeyTemplate-"><code>KeysetManager.add(com.google.crypto.tink.proto.KeyTemplate)</code></a>. This method adds a new key and immediately promotes it to
      primary. However, when you do keyset rotation, you almost never want to make the new key
      primary, because old binaries don't know the new key yet.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/RsaSsaPssSignKeyManager.html#rsa3072PssSha256F4Template--">com.google.crypto.tink.signature.RsaSsaPssSignKeyManager.rsa3072PssSha256F4Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("RSA_SSA_PSS_3072_SHA256_F4")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/RsaSsaPkcs1SignKeyManager.html#rsa3072SsaPkcs1Sha256F4Template--">com.google.crypto.tink.signature.RsaSsaPkcs1SignKeyManager.rsa3072SsaPkcs1Sha256F4Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("RSA_SSA_PKCS1_3072_SHA256_F4")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/RsaSsaPssSignKeyManager.html#rsa4096PssSha512F4Template--">com.google.crypto.tink.signature.RsaSsaPssSignKeyManager.rsa4096PssSha512F4Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("RSA_SSA_PSS_4096_SHA512_F4")</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/signature/RsaSsaPkcs1SignKeyManager.html#rsa4096SsaPkcs1Sha512F4Template--">com.google.crypto.tink.signature.RsaSsaPkcs1SignKeyManager.rsa4096SsaPkcs1Sha512F4Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("RSA_SSA_PKCS1_4096_SHA512_F4")</code></span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/PrimitiveSet.html#setPrimary-com.google.crypto.tink.PrimitiveSet.Entry-">com.google.crypto.tink.PrimitiveSet.setPrimary(PrimitiveSet.Entry&lt;P&gt;)</a>
 <div class="block"><span class="deprecationComment">use <code>Builder.addPrimaryPrimitive</code> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/jwt/JwkSetConverter.html#toKeysetHandle-java.lang.String-com.google.crypto.tink.tinkkey.KeyAccess-">com.google.crypto.tink.jwt.JwkSetConverter.toKeysetHandle(String, KeyAccess)</a>
 <div class="block"><span class="deprecationComment">Use JwkSetConverter.toPublicKeysetHandle(jwkSet) instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/JwtHmacAlgorithm.html#valueOf-int-">com.google.crypto.tink.proto.JwtHmacAlgorithm.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/JwtHmacAlgorithm.html#forNumber-int-"><code>JwtHmacAlgorithm.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/JwtRsaSsaPssAlgorithm.html#valueOf-int-">com.google.crypto.tink.proto.JwtRsaSsaPssAlgorithm.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/JwtRsaSsaPssAlgorithm.html#forNumber-int-"><code>JwtRsaSsaPssAlgorithm.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/JwtRsaSsaPkcs1Algorithm.html#valueOf-int-">com.google.crypto.tink.proto.JwtRsaSsaPkcs1Algorithm.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/JwtRsaSsaPkcs1Algorithm.html#forNumber-int-"><code>JwtRsaSsaPkcs1Algorithm.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/JwtEcdsaAlgorithm.html#valueOf-int-">com.google.crypto.tink.proto.JwtEcdsaAlgorithm.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/JwtEcdsaAlgorithm.html#forNumber-int-"><code>JwtEcdsaAlgorithm.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/EcdsaSignatureEncoding.html#valueOf-int-">com.google.crypto.tink.proto.EcdsaSignatureEncoding.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/EcdsaSignatureEncoding.html#forNumber-int-"><code>EcdsaSignatureEncoding.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/HpkeKem.html#valueOf-int-">com.google.crypto.tink.proto.HpkeKem.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/HpkeKem.html#forNumber-int-"><code>HpkeKem.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/HpkeKdf.html#valueOf-int-">com.google.crypto.tink.proto.HpkeKdf.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/HpkeKdf.html#forNumber-int-"><code>HpkeKdf.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/HpkeAead.html#valueOf-int-">com.google.crypto.tink.proto.HpkeAead.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/HpkeAead.html#forNumber-int-"><code>HpkeAead.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/HashType.html#valueOf-int-">com.google.crypto.tink.proto.HashType.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/HashType.html#forNumber-int-"><code>HashType.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/EllipticCurveType.html#valueOf-int-">com.google.crypto.tink.proto.EllipticCurveType.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/EllipticCurveType.html#forNumber-int-"><code>EllipticCurveType.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/EcPointFormat.html#valueOf-int-">com.google.crypto.tink.proto.EcPointFormat.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/EcPointFormat.html#forNumber-int-"><code>EcPointFormat.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/OutputPrefixType.html#valueOf-int-">com.google.crypto.tink.proto.OutputPrefixType.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/OutputPrefixType.html#forNumber-int-"><code>OutputPrefixType.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/KeyStatusType.html#valueOf-int-">com.google.crypto.tink.proto.KeyStatusType.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/KeyStatusType.html#forNumber-int-"><code>KeyStatusType.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/proto/KeyData.KeyMaterialType.html#valueOf-int-">com.google.crypto.tink.proto.KeyData.KeyMaterialType.valueOf(int)</a>
 <div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/proto/KeyData.KeyMaterialType.html#forNumber-int-"><code>KeyData.KeyMaterialType.forNumber(int)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/JsonKeysetWriter.html#withFile-java.io.File-">com.google.crypto.tink.JsonKeysetWriter.withFile(File)</a></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/JsonKeysetReader.html#withFile-java.io.File-">com.google.crypto.tink.JsonKeysetReader.withFile(File)</a></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/BinaryKeysetWriter.html#withFile-java.io.File-">com.google.crypto.tink.BinaryKeysetWriter.withFile(File)</a></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/BinaryKeysetReader.html#withFile-java.io.File-">com.google.crypto.tink.BinaryKeysetReader.withFile(File)</a></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/JsonKeysetReader.html#withJsonObject-java.lang.Object-">com.google.crypto.tink.JsonKeysetReader.withJsonObject(Object)</a>
 <div class="block"><span class="deprecationComment">Use <code>#withString</code></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/JsonKeysetWriter.html#withPath-java.nio.file.Path-">com.google.crypto.tink.JsonKeysetWriter.withPath(Path)</a></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/JsonKeysetReader.html#withPath-java.nio.file.Path-">com.google.crypto.tink.JsonKeysetReader.withPath(Path)</a></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/JsonKeysetWriter.html#withPath-java.lang.String-">com.google.crypto.tink.JsonKeysetWriter.withPath(String)</a></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="com/google/crypto/tink/JsonKeysetReader.html#withPath-java.lang.String-">com.google.crypto.tink.JsonKeysetReader.withPath(String)</a></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="com/google/crypto/tink/aead/XChaCha20Poly1305KeyManager.html#xChaCha20Poly1305Template--">com.google.crypto.tink.aead.XChaCha20Poly1305KeyManager.xChaCha20Poly1305Template()</a>
 <div class="block"><span class="deprecationComment">use <code>KeyTemplates.get("XCHACHA20_POLY1305")</code></span></div>
 </td>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/index-all.html b/javadoc/tink/HEAD-SNAPSHOT/index-all.html
index 54c8666..b71dc38 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/index-all.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/index-all.html
@@ -1065,11 +1065,19 @@
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/subtle/AesEaxJce.html#AesEaxJce-byte:A-int-">AesEaxJce(byte[], int)</a></span> - Constructor for class com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/AesEaxJce.html" title="class in com.google.crypto.tink.subtle">AesEaxJce</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxKey</span></a> - Class in <a href="com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></dt>
+<dd>
+<div class="block">Represents an AES-EAX key used for computing AEAD.</div>
+</dd>
 <dt><a href="com/google/crypto/tink/proto/AesEaxKey.html" title="class in com.google.crypto.tink.proto"><span class="typeNameLink">AesEaxKey</span></a> - Class in <a href="com/google/crypto/tink/proto/package-summary.html">com.google.crypto.tink.proto</a></dt>
 <dd>
 <div class="block">
  key_type: type.googleapis.com/google.crypto.tink.AesEaxKey</div>
 </dd>
+<dt><a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxKey.Builder</span></a> - Class in <a href="com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></dt>
+<dd>
+<div class="block">Builder for AesEaxKey.</div>
+</dd>
 <dt><a href="com/google/crypto/tink/proto/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.proto"><span class="typeNameLink">AesEaxKey.Builder</span></a> - Class in <a href="com/google/crypto/tink/proto/package-summary.html">com.google.crypto.tink.proto</a></dt>
 <dd>
 <div class="block">
@@ -1091,6 +1099,18 @@
 </dd>
 <dt><a href="com/google/crypto/tink/proto/AesEaxKeyOrBuilder.html" title="interface in com.google.crypto.tink.proto"><span class="typeNameLink">AesEaxKeyOrBuilder</span></a> - Interface in <a href="com/google/crypto/tink/proto/package-summary.html">com.google.crypto.tink.proto</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxParameters</span></a> - Class in <a href="com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></dt>
+<dd>
+<div class="block">Describes the parameters of an <a href="com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><code>AesEaxKey</code></a>.</div>
+</dd>
+<dt><a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxParameters.Builder</span></a> - Class in <a href="com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></dt>
+<dd>
+<div class="block">Builds a new AesEaxParameters instance.</div>
+</dd>
+<dt><a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxParameters.Variant</span></a> - Class in <a href="com/google/crypto/tink/aead/package-summary.html">com.google.crypto.tink.aead</a></dt>
+<dd>
+<div class="block">Describes how the prefix is computed.</div>
+</dd>
 <dt><a href="com/google/crypto/tink/proto/AesEaxParams.html" title="class in com.google.crypto.tink.proto"><span class="typeNameLink">AesEaxParams</span></a> - Class in <a href="com/google/crypto/tink/proto/package-summary.html">com.google.crypto.tink.proto</a></dt>
 <dd>
 <div class="block">
@@ -1320,6 +1340,11 @@
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/HpkeUtil.html#BASE_MODE">BASE_MODE</a></span> - Static variable in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/HpkeUtil.html" title="class in com.google.crypto.tink.hybrid.internal">HpkeUtil</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">BigIntegerEncoding</span></a> - Class in <a href="com/google/crypto/tink/internal/package-summary.html">com.google.crypto.tink.internal</a></dt>
+<dd>
+<div class="block">Helper class with functions that encode and decode non-negative <a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math"><code>BigInteger</code></a> to
+ and from <code>byte[]</code>.</div>
+</dd>
 <dt><a href="com/google/crypto/tink/BinaryKeysetReader.html" title="class in com.google.crypto.tink"><span class="typeNameLink">BinaryKeysetReader</span></a> - Class in <a href="com/google/crypto/tink/package-summary.html">com.google.crypto.tink</a></dt>
 <dd>
 <div class="block">A <a href="com/google/crypto/tink/KeysetReader.html" title="interface in com.google.crypto.tink"><code>KeysetReader</code></a> that can read from some source cleartext or encrypted keysets in <a
@@ -1332,6 +1357,10 @@
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/internal/AesUtil.html#BLOCK_SIZE">BLOCK_SIZE</a></span> - Static variable in class com.google.crypto.tink.mac.internal.<a href="com/google/crypto/tink/mac/internal/AesUtil.html" title="class in com.google.crypto.tink.mac.internal">AesUtil</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html#build--">build()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html#build--">build()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/jwt/JwtValidator.Builder.html#build--">build()</a></span> - Method in class com.google.crypto.tink.jwt.<a href="com/google/crypto/tink/jwt/JwtValidator.Builder.html" title="class in com.google.crypto.tink.jwt">JwtValidator.Builder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/jwt/RawJwt.Builder.html#build--">build()</a></span> - Method in class com.google.crypto.tink.jwt.<a href="com/google/crypto/tink/jwt/RawJwt.Builder.html" title="class in com.google.crypto.tink.jwt">RawJwt.Builder</a></dt>
@@ -1552,6 +1581,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/util/KeysDownloader.Builder.html#build--">build()</a></span> - Method in class com.google.crypto.tink.util.<a href="com/google/crypto/tink/util/KeysDownloader.Builder.html" title="class in com.google.crypto.tink.util">KeysDownloader.Builder</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxKey.html#builder--">builder()</a></span> - Static method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.html#builder--">builder()</a></span> - Static method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/PrimitiveRegistry.Builder.html#Builder--">Builder()</a></span> - Constructor for class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/PrimitiveRegistry.Builder.html" title="class in com.google.crypto.tink.internal">PrimitiveRegistry.Builder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/PrimitiveRegistry.Builder.html#Builder-com.google.crypto.tink.internal.PrimitiveRegistry-">Builder(PrimitiveRegistry)</a></span> - Constructor for class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/PrimitiveRegistry.Builder.html" title="class in com.google.crypto.tink.internal">PrimitiveRegistry.Builder</a></dt>
@@ -1788,8 +1821,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/subtle/SubtleUtil.html#bytes2Integer-byte:A-">bytes2Integer(byte[])</a></span> - Static method in class com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/SubtleUtil.html" title="class in com.google.crypto.tink.subtle">SubtleUtil</a></dt>
 <dd>
-<div class="block">Converts an byte array to a nonnegative integer
- (https://tools.ietf.org/html/rfc8017#section-4.1).</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 </dd>
 </dl>
 <a name="I:C">
@@ -1799,6 +1831,7 @@
 <dl>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyAccess.html#canAccessSecret--">canAccessSecret()</a></span> - Method in class com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns true if the <code>KeyAccess</code> instance grants access to a key's secret</div>
 </dd>
 <dt><a href="com/google/crypto/tink/Catalogue.html" title="interface in com.google.crypto.tink"><span class="typeNameLink">Catalogue</span></a>&lt;<a href="com/google/crypto/tink/Catalogue.html" title="type parameter in Catalogue">P</a>&gt; - Interface in <a href="com/google/crypto/tink/package-summary.html">com.google.crypto.tink</a></dt>
@@ -4038,6 +4071,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyHandle.html#createFromKey-com.google.crypto.tink.tinkkey.TinkKey-com.google.crypto.tink.tinkkey.KeyAccess-">createFromKey(TinkKey, KeyAccess)</a></span> - Static method in class com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns a <a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a> instance with <code>key</code> as the underlying <a href="com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> if the
  caller provides the correct <a href="com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a> instance.</div>
 </dd>
@@ -4108,6 +4142,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/proto/RsaSsaPssPrivateKey.html#CRT_FIELD_NUMBER">CRT_FIELD_NUMBER</a></span> - Static variable in class com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/RsaSsaPssPrivateKey.html" title="class in com.google.crypto.tink.proto">RsaSsaPssPrivateKey</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html#CRUNCHY">CRUNCHY</a></span> - Static variable in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacParameters.Variant.html#CRUNCHY">CRUNCHY</a></span> - Static variable in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacParameters.Variant.html" title="class in com.google.crypto.tink.mac">AesCmacParameters.Variant</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/HmacParameters.Variant.html#CRUNCHY">CRUNCHY</a></span> - Static variable in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/HmacParameters.Variant.html" title="class in com.google.crypto.tink.mac">HmacParameters.Variant</a></dt>
@@ -5051,6 +5087,8 @@
 <dd>
 <div class="block">Best effort fix-timing array comparison.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/LegacyProtoParameters.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/LegacyProtoParameters.html" title="class in com.google.crypto.tink.internal">LegacyProtoParameters</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacParameters.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacParameters.html" title="class in com.google.crypto.tink.mac">AesCmacParameters</a></dt>
@@ -5253,6 +5291,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/util/Bytes.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class com.google.crypto.tink.util.<a href="com/google/crypto/tink/util/Bytes.html" title="class in com.google.crypto.tink.util">Bytes</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxKey.html#equalsKey-com.google.crypto.tink.Key-">equalsKey(Key)</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/LegacyProtoKey.html#equalsKey-com.google.crypto.tink.Key-">equalsKey(Key)</a></span> - Method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/LegacyProtoKey.html" title="class in com.google.crypto.tink.internal">LegacyProtoKey</a></dt>
 <dd>
 <div class="block">Returns true if we are sure that the other key is the same.</div>
@@ -5436,6 +5476,10 @@
 <dd>
 <div class="block">Converts a Tink KeysetHandle with JWT public keys into a Json Web Key (JWK) set.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/BigIntegerEncoding.html#fromUnsignedBigEndianBytes-byte:A-">fromUnsignedBigEndianBytes(byte[])</a></span> - Static method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal">BigIntegerEncoding</a></dt>
+<dd>
+<div class="block">Parses a <a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math"><code>BigInteger</code></a> from a byte array using unsigned big-endian encoding.</div>
+</dd>
 </dl>
 <a name="I:G">
 <!--   -->
@@ -5476,6 +5520,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyHandle.html#generateNew-com.google.crypto.tink.KeyTemplate-">generateNew(KeyTemplate)</a></span> - Static method in class com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Generates a new <a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a> that contains a fresh key generated according to <code>keyTemplate</code>.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/subtle/X25519.html#generatePrivateKey--">generatePrivateKey()</a></span> - Static method in class com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/X25519.html" title="class in com.google.crypto.tink.subtle">X25519</a></dt>
@@ -8330,10 +8375,13 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyHandle.html#getId--">getId()</a></span> - Method in class com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the key ID of this key.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/PrimitiveSet.Entry.html#getIdentifier--">getIdentifier()</a></span> - Method in class com.google.crypto.tink.<a href="com/google/crypto/tink/PrimitiveSet.Entry.html" title="class in com.google.crypto.tink">PrimitiveSet.Entry</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxKey.html#getIdRequirementOrNull--">getIdRequirementOrNull()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/LegacyProtoKey.html#getIdRequirementOrNull--">getIdRequirementOrNull()</a></span> - Method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/LegacyProtoKey.html" title="class in com.google.crypto.tink.internal">LegacyProtoKey</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/ProtoKeySerialization.html#getIdRequirementOrNull--">getIdRequirementOrNull()</a></span> - Method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/ProtoKeySerialization.html" title="class in com.google.crypto.tink.internal">ProtoKeySerialization</a></dt>
@@ -8430,6 +8478,8 @@
 <div class="block">
  possible value is 12 or 16 bytes.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.html#getIvSizeBytes--">getIvSizeBytes()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/jwt/VerifiedJwt.html#getJsonArrayClaim-java.lang.String-">getJsonArrayClaim(String)</a></span> - Method in class com.google.crypto.tink.jwt.<a href="com/google/crypto/tink/jwt/VerifiedJwt.html" title="class in com.google.crypto.tink.jwt">VerifiedJwt</a></dt>
 <dd>
 <div class="block">Returns the non-registered claim of name <code>name</code> and type JSON Array encoded in a string.</div>
@@ -8581,6 +8631,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyHandle.html#getKey-com.google.crypto.tink.tinkkey.KeyAccess-">getKey(KeyAccess)</a></span> - Method in class com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the underlying <a href="com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> key if <code>access</code> is a <a href="com/google/crypto/tink/tinkkey/SecretKeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>SecretKeyAccess</code></a> and
  the key has a secret, or if the key does not have a secret, otherwise throws a <a href="https://docs.oracle.com/javase/8/docs/api/java/security/GeneralSecurityException.html?is-external=true" title="class or interface in java.security"><code>GeneralSecurityException</code></a>.</div>
 </dd>
@@ -8594,6 +8645,10 @@
 <div class="block">
  Actual keys in the Keyset.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxKey.html#getKeyBytes--">getKeyBytes()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></dt>
+<dd>
+<div class="block">Returns the underlying key bytes.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/HmacKey.html#getKeyBytes--">getKeyBytes()</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/HmacKey.html" title="class in com.google.crypto.tink.mac">HmacKey</a></dt>
 <dd>
 <div class="block">Returns the underlying key bytes.</div>
@@ -9105,6 +9160,8 @@
 <dd>
 <div class="block"><code>uint32 key_size = 3;</code></div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.html#getKeySizeBytes--">getKeySizeBytes()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacParameters.html#getKeySizeBytes--">getKeySizeBytes()</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacParameters.html" title="class in com.google.crypto.tink.mac">AesCmacParameters</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/HmacParameters.html#getKeySizeBytes--">getKeySizeBytes()</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/HmacParameters.html" title="class in com.google.crypto.tink.mac">HmacParameters</a></dt>
@@ -9123,10 +9180,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyHandle.html#getKeyTemplate--">getKeyTemplate()</a></span> - Method in class com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the <a href="com/google/crypto/tink/KeyTemplate.html" title="class in com.google.crypto.tink"><code>KeyTemplate</code></a> of the underlying <a href="com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a>.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/TinkKey.html#getKeyTemplate--">getKeyTemplate()</a></span> - Method in interface com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">A <code>TinkKey</code> should know the <code>KeyTemplate</code> from which it was generated,
  which in turn specifies the cryptographic algorithm in which the <code>TinkKey</code> should
  be used.</div>
@@ -9738,6 +9797,8 @@
 <dd>
 <div class="block">Returns a <a href="com/google/crypto/tink/util/Bytes.html" title="class in com.google.crypto.tink.util"><code>Bytes</code></a> instance which is prefixed to the ciphertext.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxKey.html#getOutputPrefix--">getOutputPrefix()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/CryptoFormat.html#getOutputPrefix-com.google.crypto.tink.proto.Keyset.Key-">getOutputPrefix(Keyset.Key)</a></span> - Static method in class com.google.crypto.tink.<a href="com/google/crypto/tink/CryptoFormat.html" title="class in com.google.crypto.tink">CryptoFormat</a></dt>
 <dd>
 <div class="block">Generates the prefix of all cryptographic outputs (ciphertexts, signatures, MACs, ...) produced
@@ -9926,6 +9987,8 @@
 <dd>
 <div class="block">Returns the parameters of this key.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxKey.html#getParameters--">getParameters()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead">AesEaxKey</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/LegacyProtoKey.html#getParameters--">getParameters()</a></span> - Method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/LegacyProtoKey.html" title="class in com.google.crypto.tink.internal">LegacyProtoKey</a></dt>
 <dd>
 <div class="block">Returns a LegacyParametersNotForCreation object.</div>
@@ -12049,6 +12112,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyHandle.html#getStatus--">getStatus()</a></span> - Method in class com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the status of the key.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/proto/Keyset.Key.Builder.html#getStatusValue--">getStatusValue()</a></span> - Method in class com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/Keyset.Key.Builder.html" title="class in com.google.crypto.tink.proto">Keyset.Key.Builder</a></dt>
@@ -12114,6 +12178,8 @@
 <dd>
 <div class="block"><code>uint32 tag_size = 2;</code></div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.html#getTagSizeBytes--">getTagSizeBytes()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/Config.html#getTinkKeyTypeEntry-java.lang.String-java.lang.String-java.lang.String-int-boolean-">getTinkKeyTypeEntry(String, String, String, int, boolean)</a></span> - Static method in class com.google.crypto.tink.<a href="com/google/crypto/tink/Config.html" title="class in com.google.crypto.tink">Config</a></dt>
 <dd>
 <div class="block">Returns a <a href="com/google/crypto/tink/proto/KeyTypeEntry.html" title="class in com.google.crypto.tink.proto"><code>KeyTypeEntry</code></a> for Tink key types with the specified properties.</div>
@@ -12620,6 +12686,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/proto/OutputPrefixType.html#getValueDescriptor--">getValueDescriptor()</a></span> - Method in enum com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/OutputPrefixType.html" title="enum in com.google.crypto.tink.proto">OutputPrefixType</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.html#getVariant--">getVariant()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dt>
+<dd>
+<div class="block">Returns a variant object.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacParameters.html#getVariant--">getVariant()</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacParameters.html" title="class in com.google.crypto.tink.mac">AesCmacParameters</a></dt>
 <dd>
 <div class="block">Returns a variant object.</div>
@@ -13584,6 +13654,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/proto/RsaSsaPkcs1Params.html#HASH_TYPE_FIELD_NUMBER">HASH_TYPE_FIELD_NUMBER</a></span> - Static variable in class com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/RsaSsaPkcs1Params.html" title="class in com.google.crypto.tink.proto">RsaSsaPkcs1Params</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.html#hashCode--">hashCode()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/LegacyProtoParameters.html#hashCode--">hashCode()</a></span> - Method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/LegacyProtoParameters.html" title="class in com.google.crypto.tink.internal">LegacyProtoParameters</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacParameters.html#hashCode--">hashCode()</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacParameters.html" title="class in com.google.crypto.tink.mac">AesCmacParameters</a></dt>
@@ -13829,6 +13901,8 @@
 <dd>
 <div class="block">Protobuf enum <code>google.crypto.tink.HashType</code></div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.html#hasIdRequirement--">hasIdRequirement()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/LegacyProtoParameters.html#hasIdRequirement--">hasIdRequirement()</a></span> - Method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/LegacyProtoParameters.html" title="class in com.google.crypto.tink.internal">LegacyProtoParameters</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacParameters.html#hasIdRequirement--">hasIdRequirement()</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacParameters.html" title="class in com.google.crypto.tink.mac">AesCmacParameters</a></dt>
@@ -14424,10 +14498,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyHandle.html#hasSecret--">hasSecret()</a></span> - Method in class com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns <code>true</code> if the underlying <a href="com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> has a secret.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/TinkKey.html#hasSecret--">hasSecret()</a></span> - Method in interface com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey">TinkKey</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns true if the key contains secret key material, and false otherwise.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/MutableSerializationRegistry.html#hasSerializerForKey-KeyT-java.lang.Class-">hasSerializerForKey(KeyT, Class&lt;SerializationT&gt;)</a></span> - Method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/MutableSerializationRegistry.html" title="class in com.google.crypto.tink.internal">MutableSerializationRegistry</a></dt>
@@ -14956,7 +15032,7 @@
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#init--">init()</a></span> - Static method in class com.google.crypto.tink.daead.<a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html" title="class in com.google.crypto.tink.daead">DeterministicAeadConfig</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>DeterministicAeadConfig.register()</code></a></span></div>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>register()</code></a></span></div>
 </div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/HybridConfig.html#init--">init()</a></span> - Static method in class com.google.crypto.tink.hybrid.<a href="com/google/crypto/tink/hybrid/HybridConfig.html" title="class in com.google.crypto.tink.hybrid">HybridConfig</a></dt>
@@ -15024,6 +15100,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/SecretKeyAccess.html#insecureSecretAccess--">insecureSecretAccess()</a></span> - Static method in class com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/SecretKeyAccess.html" title="class in com.google.crypto.tink.tinkkey">SecretKeyAccess</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns a <code>KeyAccess</code> instance where <code>canAccessSecret()</code> returns true.</div>
 </dd>
 <dt><a href="com/google/crypto/tink/InsecureSecretKeyAccess.html" title="class in com.google.crypto.tink"><span class="typeNameLink">InsecureSecretKeyAccess</span></a> - Class in <a href="com/google/crypto/tink/package-summary.html">com.google.crypto.tink</a></dt>
@@ -16296,7 +16373,9 @@
 <dd>&nbsp;</dd>
 <dt><a href="com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><span class="typeNameLink">KeyAccess</span></a> - Class in <a href="com/google/crypto/tink/tinkkey/package-summary.html">com.google.crypto.tink.tinkkey</a></dt>
 <dd>
-<div class="block">An access token for <code>TinkKey</code>.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> instead.</span></div>
+</div>
 </dd>
 <dt><a href="com/google/crypto/tink/proto/KeyData.html" title="class in com.google.crypto.tink.proto"><span class="typeNameLink">KeyData</span></a> - Class in <a href="com/google/crypto/tink/proto/package-summary.html">com.google.crypto.tink.proto</a></dt>
 <dd>
@@ -16390,15 +16469,19 @@
 </dd>
 <dt><a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><span class="typeNameLink">KeyHandle</span></a> - Class in <a href="com/google/crypto/tink/tinkkey/package-summary.html">com.google.crypto.tink.tinkkey</a></dt>
 <dd>
-<div class="block">Wraps a <a href="com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> and enforces access to the underlying <a href="com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><code>TinkKey</code></a> with <a href="com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyAccess</code></a>.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyHandle.html#KeyHandle-com.google.crypto.tink.tinkkey.TinkKey-com.google.crypto.tink.tinkkey.KeyHandle.KeyStatusType-int-">KeyHandle(TinkKey, KeyHandle.KeyStatusType, int)</a></span> - Constructor for class com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey">KeyHandle</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Constructor intended for Tink internal purposes; allows one to set all the member variables of
  a <a href="com/google/crypto/tink/tinkkey/KeyHandle.html" title="class in com.google.crypto.tink.tinkkey"><code>KeyHandle</code></a>.</div>
 </dd>
 <dt><a href="com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey"><span class="typeNameLink">KeyHandle.KeyStatusType</span></a> - Enum in <a href="com/google/crypto/tink/tinkkey/package-summary.html">com.google.crypto.tink.tinkkey</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">KeyStatusType is metadata associated to a key which is only meaningful when the key is part of
  a <code>Keyset</code>.</div>
 </dd>
@@ -16774,7 +16857,7 @@
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#LATEST">LATEST</a></span> - Static variable in class com.google.crypto.tink.daead.<a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html" title="class in com.google.crypto.tink.daead">DeterministicAeadConfig</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>DeterministicAeadConfig.register()</code></a></span></div>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>register()</code></a></span></div>
 </div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/HybridConfig.html#LATEST">LATEST</a></span> - Static variable in class com.google.crypto.tink.hybrid.<a href="com/google/crypto/tink/hybrid/HybridConfig.html" title="class in com.google.crypto.tink.hybrid">HybridConfig</a></dt>
@@ -19005,6 +19088,8 @@
 <dd>
 <div class="block">Encoder flag bit to omit the padding '=' characters at the end of the output (if any).</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html#NO_PREFIX">NO_PREFIX</a></span> - Static variable in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacParameters.Variant.html#NO_PREFIX">NO_PREFIX</a></span> - Static variable in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacParameters.Variant.html" title="class in com.google.crypto.tink.mac">AesCmacParameters.Variant</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/HmacParameters.Variant.html#NO_PREFIX">NO_PREFIX</a></span> - Static variable in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/HmacParameters.Variant.html" title="class in com.google.crypto.tink.mac">HmacParameters.Variant</a></dt>
@@ -21932,6 +22017,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyAccess.html#publicAccess--">publicAccess()</a></span> - Static method in class com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyAccess.html" title="class in com.google.crypto.tink.tinkkey">KeyAccess</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns a <code>KeyAccess</code> instance where <code>canAccessSecret()</code> returns false.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/subtle/X25519.html#publicFromPrivate-byte:A-">publicFromPrivate(byte[])</a></span> - Static method in class com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/X25519.html" title="class in com.google.crypto.tink.subtle">X25519</a></dt>
@@ -22644,7 +22730,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/SecretKeyAccess.html#requireAccess-com.google.crypto.tink.SecretKeyAccess-">requireAccess(SecretKeyAccess)</a></span> - Static method in class com.google.crypto.tink.<a href="com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink">SecretKeyAccess</a></dt>
 <dd>
-<div class="block">Throws an exception if the passed in SecretKeyAccess is null, otherwise returns it.</div>
+<div class="block">Throws an exception if the passed in <a href="com/google/crypto/tink/SecretKeyAccess.html" title="class in com.google.crypto.tink"><code>SecretKeyAccess</code></a> is null, otherwise returns it.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/config/TinkFips.html#restrictToFips--">restrictToFips()</a></span> - Static method in class com.google.crypto.tink.config.<a href="com/google/crypto/tink/config/TinkFips.html" title="class in com.google.crypto.tink.config">TinkFips</a></dt>
 <dd>&nbsp;</dd>
@@ -22927,7 +23013,9 @@
 </dd>
 <dt><a href="com/google/crypto/tink/tinkkey/SecretKeyAccess.html" title="class in com.google.crypto.tink.tinkkey"><span class="typeNameLink">SecretKeyAccess</span></a> - Class in <a href="com/google/crypto/tink/tinkkey/package-summary.html">com.google.crypto.tink.tinkkey</a></dt>
 <dd>
-<div class="block">A class used to generate <code>KeyAccess</code> instances granting secret access.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/InsecureSecretKeyAccess.html" title="class in com.google.crypto.tink"><code>InsecureSecretKeyAccess</code></a> instead.</span></div>
+</div>
 </dd>
 <dt><a href="com/google/crypto/tink/subtle/SelfKeyTestValidators.html" title="class in com.google.crypto.tink.subtle"><span class="typeNameLink">SelfKeyTestValidators</span></a> - Class in <a href="com/google/crypto/tink/subtle/package-summary.html">com.google.crypto.tink.subtle</a></dt>
 <dd>
@@ -23666,6 +23754,8 @@
 <dd>
 <div class="block">Sets the HTTP transport.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html#setIdRequirement-java.lang.Integer-">setIdRequirement(Integer)</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacKey.Builder.html#setIdRequirement-java.lang.Integer-">setIdRequirement(Integer)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacKey.Builder.html" title="class in com.google.crypto.tink.mac">AesCmacKey.Builder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/HmacKey.Builder.html#setIdRequirement-java.lang.Integer-">setIdRequirement(Integer)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/HmacKey.Builder.html" title="class in com.google.crypto.tink.mac">HmacKey.Builder</a></dt>
@@ -23689,6 +23779,10 @@
 <div class="block">
  possible value is 12 or 16 bytes.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setIvSizeBytes-int-">setIvSizeBytes(int)</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></dt>
+<dd>
+<div class="block">IV size must be 12 or 16 bytes.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/jwt/RawJwt.Builder.html#setJwtId-java.lang.String-">setJwtId(String)</a></span> - Method in class com.google.crypto.tink.jwt.<a href="com/google/crypto/tink/jwt/RawJwt.Builder.html" title="class in com.google.crypto.tink.jwt">RawJwt.Builder</a></dt>
 <dd>
 <div class="block">Sets the JWT ID claim that provides a unique identifier for the JWT.</div>
@@ -23739,6 +23833,8 @@
 <div class="block">
  Actual keys in the Keyset.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html#setKeyBytes-com.google.crypto.tink.util.SecretBytes-">setKeyBytes(SecretBytes)</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/HmacKey.Builder.html#setKeyBytes-com.google.crypto.tink.util.SecretBytes-">setKeyBytes(SecretBytes)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/HmacKey.Builder.html" title="class in com.google.crypto.tink.mac">HmacKey.Builder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/proto/Keyset.Key.Builder.html#setKeyData-com.google.crypto.tink.proto.KeyData-">setKeyData(KeyData)</a></span> - Method in class com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/Keyset.Key.Builder.html" title="class in com.google.crypto.tink.proto">Keyset.Key.Builder</a></dt>
@@ -23853,6 +23949,10 @@
 <dd>
 <div class="block"><code>uint32 key_size = 3;</code></div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setKeySizeBytes-int-">setKeySizeBytes(int)</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></dt>
+<dd>
+<div class="block">Accepts key sizes of 16, 24 or 32 bytes.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacParameters.Builder.html#setKeySizeBytes-int-">setKeySizeBytes(int)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacParameters.Builder.html" title="class in com.google.crypto.tink.mac">AesCmacParameters.Builder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/HmacParameters.Builder.html#setKeySizeBytes-int-">setKeySizeBytes(int)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/HmacParameters.Builder.html" title="class in com.google.crypto.tink.mac">HmacParameters.Builder</a></dt>
@@ -24066,6 +24166,8 @@
 <div class="block">
  The following parameters are used to optimize RSA signature computation.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html#setParameters-com.google.crypto.tink.aead.AesEaxParameters-">setParameters(AesEaxParameters)</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxKey.Builder</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacKey.Builder.html#setParameters-com.google.crypto.tink.mac.AesCmacParameters-">setParameters(AesCmacParameters)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacKey.Builder.html" title="class in com.google.crypto.tink.mac">AesCmacKey.Builder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/HmacKey.Builder.html#setParameters-com.google.crypto.tink.mac.HmacParameters-">setParameters(HmacParameters)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/HmacKey.Builder.html" title="class in com.google.crypto.tink.mac">HmacKey.Builder</a></dt>
@@ -24729,6 +24831,10 @@
 <dd>
 <div class="block"><code>uint32 tag_size = 2;</code></div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setTagSizeBytes-int-">setTagSizeBytes(int)</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></dt>
+<dd>
+<div class="block">The tag size accepts values between 0 and 16 bytes.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacParameters.Builder.html#setTagSizeBytes-int-">setTagSizeBytes(int)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacParameters.Builder.html" title="class in com.google.crypto.tink.mac">AesCmacParameters.Builder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/HmacParameters.Builder.html#setTagSizeBytes-int-">setTagSizeBytes(int)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/HmacParameters.Builder.html" title="class in com.google.crypto.tink.mac">HmacParameters.Builder</a></dt>
@@ -25013,6 +25119,8 @@
 <dd>
 <div class="block"><code>string value = 1;</code></div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html#setVariant-com.google.crypto.tink.aead.AesEaxParameters.Variant-">setVariant(AesEaxParameters.Variant)</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Builder</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacParameters.Builder.html#setVariant-com.google.crypto.tink.mac.AesCmacParameters.Variant-">setVariant(AesCmacParameters.Variant)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacParameters.Builder.html" title="class in com.google.crypto.tink.mac">AesCmacParameters.Builder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/HmacParameters.Builder.html#setVariant-com.google.crypto.tink.mac.HmacParameters.Variant-">setVariant(HmacParameters.Variant)</a></span> - Method in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/HmacParameters.Builder.html" title="class in com.google.crypto.tink.mac">HmacParameters.Builder</a></dt>
@@ -25458,6 +25566,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/subtle/EngineWrapper.TCipher.html#TCipher--">TCipher()</a></span> - Constructor for class com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/EngineWrapper.TCipher.html" title="class in com.google.crypto.tink.subtle">EngineWrapper.TCipher</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html#TINK">TINK</a></span> - Static variable in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/AesCmacParameters.Variant.html#TINK">TINK</a></span> - Static variable in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/AesCmacParameters.Variant.html" title="class in com.google.crypto.tink.mac">AesCmacParameters.Variant</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/mac/HmacParameters.Variant.html#TINK">TINK</a></span> - Static variable in class com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/HmacParameters.Variant.html" title="class in com.google.crypto.tink.mac">HmacParameters.Variant</a></dt>
@@ -25503,7 +25613,7 @@
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#TINK_1_1_0">TINK_1_1_0</a></span> - Static variable in class com.google.crypto.tink.daead.<a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html" title="class in com.google.crypto.tink.daead">DeterministicAeadConfig</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>DeterministicAeadConfig.register()</code></a></span></div>
+<div class="block"><span class="deprecationComment">use <a href="com/google/crypto/tink/daead/DeterministicAeadConfig.html#register--"><code>register()</code></a></span></div>
 </div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/HybridConfig.html#TINK_1_1_0">TINK_1_1_0</a></span> - Static variable in class com.google.crypto.tink.hybrid.<a href="com/google/crypto/tink/hybrid/HybridConfig.html" title="class in com.google.crypto.tink.hybrid">HybridConfig</a></dt>
@@ -25579,7 +25689,9 @@
 </dd>
 <dt><a href="com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><span class="typeNameLink">TinkKey</span></a> - Interface in <a href="com/google/crypto/tink/tinkkey/package-summary.html">com.google.crypto.tink.tinkkey</a></dt>
 <dd>
-<div class="block"><code>TinkKey</code> represents how Tink views individual keys.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Use <a href="com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><code>Key</code></a> instead.</span></div>
+</div>
 </dd>
 <dt><a href="com/google/crypto/tink/TinkProtoKeysetFormat.html" title="class in com.google.crypto.tink"><span class="typeNameLink">TinkProtoKeysetFormat</span></a> - Class in <a href="com/google/crypto/tink/package-summary.html">com.google.crypto.tink</a></dt>
 <dd>
@@ -25595,6 +25707,11 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/subtle/EngineWrapper.TMessageDigest.html#TMessageDigest--">TMessageDigest()</a></span> - Constructor for class com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/EngineWrapper.TMessageDigest.html" title="class in com.google.crypto.tink.subtle">EngineWrapper.TMessageDigest</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/BigIntegerEncoding.html#toBigEndianBytes-java.math.BigInteger-">toBigEndianBytes(BigInteger)</a></span> - Static method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal">BigIntegerEncoding</a></dt>
+<dd>
+<div class="block">Encodes a non-negative <a href="https://docs.oracle.com/javase/8/docs/api/java/math/BigInteger.html?is-external=true" title="class or interface in java.math"><code>BigInteger</code></a> into the minimal two's-complement
+ representation in big-endian byte-order.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/proto/AesCmacKey.html#toBuilder--">toBuilder()</a></span> - Method in class com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/AesCmacKey.html" title="class in com.google.crypto.tink.proto">AesCmacKey</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/proto/AesCmacKeyFormat.html#toBuilder--">toBuilder()</a></span> - Method in class com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/AesCmacKeyFormat.html" title="class in com.google.crypto.tink.proto">AesCmacKeyFormat</a></dt>
@@ -25845,6 +25962,10 @@
 <div class="block">Returns the RSA SSA (Signature with Appendix) PKCS1 algorithm name corresponding to a hash
  type.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.html#toString--">toString()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead">AesEaxParameters</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html#toString--">toString()</a></span> - Method in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead">AesEaxParameters.Variant</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/LegacyProtoParameters.html#toString--">toString()</a></span> - Method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/LegacyProtoParameters.html" title="class in com.google.crypto.tink.internal">LegacyProtoParameters</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/jwt/JwtValidator.html#toString--">toString()</a></span> - Method in class com.google.crypto.tink.jwt.<a href="com/google/crypto/tink/jwt/JwtValidator.html" title="class in com.google.crypto.tink.jwt">JwtValidator</a></dt>
@@ -26330,6 +26451,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey">KeyHandle.KeyStatusType</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/config/internal/TinkFipsUtil.AlgorithmFipsCompatibility.html#values--">values()</a></span> - Static method in enum com.google.crypto.tink.config.internal.<a href="com/google/crypto/tink/config/internal/TinkFipsUtil.AlgorithmFipsCompatibility.html" title="enum in com.google.crypto.tink.config.internal">TinkFipsUtil.AlgorithmFipsCompatibility</a></dt>
@@ -26445,6 +26567,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html#values--">values()</a></span> - Static method in enum com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey">KeyHandle.KeyStatusType</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/overview-tree.html b/javadoc/tink/HEAD-SNAPSHOT/overview-tree.html
index e2016c6..8015832 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/overview-tree.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/overview-tree.html
@@ -328,17 +328,21 @@
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/AesCtrJceCipher.html" title="class in com.google.crypto.tink.subtle"><span class="typeNameLink">AesCtrJceCipher</span></a> (implements com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/IndCpaCipher.html" title="interface in com.google.crypto.tink.subtle">IndCpaCipher</a>)</li>
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/AesEax.html" title="class in com.google.crypto.tink.proto"><span class="typeNameLink">AesEax</span></a></li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/AesEaxJce.html" title="class in com.google.crypto.tink.subtle"><span class="typeNameLink">AesEaxJce</span></a> (implements com.google.crypto.tink.<a href="com/google/crypto/tink/Aead.html" title="interface in com.google.crypto.tink">Aead</a>)</li>
+<li type="circle">com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxKey.Builder</span></a></li>
+<li type="circle">com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.Builder.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxParameters.Builder</span></a></li>
+<li type="circle">com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.Variant.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxParameters.Variant</span></a></li>
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/AesGcm.html" title="class in com.google.crypto.tink.proto"><span class="typeNameLink">AesGcm</span></a></li>
 <li type="circle">com.google.crypto.tink.aead.subtle.<a href="com/google/crypto/tink/aead/subtle/AesGcmFactory.html" title="class in com.google.crypto.tink.aead.subtle"><span class="typeNameLink">AesGcmFactory</span></a> (implements com.google.crypto.tink.aead.subtle.<a href="com/google/crypto/tink/aead/subtle/AeadFactory.html" title="interface in com.google.crypto.tink.aead.subtle">AeadFactory</a>)</li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/AesGcmHkdfStreaming.html" title="class in com.google.crypto.tink.subtle"><span class="typeNameLink">AesGcmHkdfStreaming</span></a></li>
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/AesGcmHkdfStreaming.html" title="class in com.google.crypto.tink.proto"><span class="typeNameLink">AesGcmHkdfStreaming</span></a></li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/AesGcmJce.html" title="class in com.google.crypto.tink.subtle"><span class="typeNameLink">AesGcmJce</span></a> (implements com.google.crypto.tink.<a href="com/google/crypto/tink/Aead.html" title="interface in com.google.crypto.tink">Aead</a>)</li>
-<li type="circle">com.google.crypto.tink.aead.subtle.<a href="com/google/crypto/tink/aead/subtle/AesGcmSiv.html" title="class in com.google.crypto.tink.aead.subtle"><span class="typeNameLink">AesGcmSiv</span></a> (implements com.google.crypto.tink.<a href="com/google/crypto/tink/Aead.html" title="interface in com.google.crypto.tink">Aead</a>)</li>
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/AesGcmSiv.html" title="class in com.google.crypto.tink.proto"><span class="typeNameLink">AesGcmSiv</span></a></li>
+<li type="circle">com.google.crypto.tink.aead.subtle.<a href="com/google/crypto/tink/aead/subtle/AesGcmSiv.html" title="class in com.google.crypto.tink.aead.subtle"><span class="typeNameLink">AesGcmSiv</span></a> (implements com.google.crypto.tink.<a href="com/google/crypto/tink/Aead.html" title="interface in com.google.crypto.tink">Aead</a>)</li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/AesSiv.html" title="class in com.google.crypto.tink.subtle"><span class="typeNameLink">AesSiv</span></a> (implements com.google.crypto.tink.<a href="com/google/crypto/tink/DeterministicAead.html" title="interface in com.google.crypto.tink">DeterministicAead</a>)</li>
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/AesSiv.html" title="class in com.google.crypto.tink.proto"><span class="typeNameLink">AesSiv</span></a></li>
 <li type="circle">com.google.crypto.tink.mac.internal.<a href="com/google/crypto/tink/mac/internal/AesUtil.html" title="class in com.google.crypto.tink.mac.internal"><span class="typeNameLink">AesUtil</span></a></li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/Base64.html" title="class in com.google.crypto.tink.subtle"><span class="typeNameLink">Base64</span></a></li>
+<li type="circle">com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/BigIntegerEncoding.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">BigIntegerEncoding</span></a></li>
 <li type="circle">com.google.crypto.tink.<a href="com/google/crypto/tink/BinaryKeysetReader.html" title="class in com.google.crypto.tink"><span class="typeNameLink">BinaryKeysetReader</span></a> (implements com.google.crypto.tink.<a href="com/google/crypto/tink/KeysetReader.html" title="interface in com.google.crypto.tink">KeysetReader</a>)</li>
 <li type="circle">com.google.crypto.tink.<a href="com/google/crypto/tink/BinaryKeysetWriter.html" title="class in com.google.crypto.tink"><span class="typeNameLink">BinaryKeysetWriter</span></a> (implements com.google.crypto.tink.<a href="com/google/crypto/tink/KeysetWriter.html" title="interface in com.google.crypto.tink">KeysetWriter</a>)</li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/Bytes.html" title="class in com.google.crypto.tink.subtle"><span class="typeNameLink">Bytes</span></a></li>
@@ -427,7 +431,11 @@
 <li type="circle">com.google.crypto.tink.jwt.<a href="com/google/crypto/tink/jwt/JwtValidator.Builder.html" title="class in com.google.crypto.tink.jwt"><span class="typeNameLink">JwtValidator.Builder</span></a></li>
 <li type="circle">com.google.crypto.tink.<a href="com/google/crypto/tink/Key.html" title="class in com.google.crypto.tink"><span class="typeNameLink">Key</span></a>
 <ul>
-<li type="circle">com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AeadKey</span></a></li>
+<li type="circle">com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AeadKey.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AeadKey</span></a>
+<ul>
+<li type="circle">com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxKey.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxKey</span></a></li>
+</ul>
+</li>
 <li type="circle">com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/LegacyProtoKey.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">LegacyProtoKey</span></a></li>
 <li type="circle">com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/MacKey.html" title="class in com.google.crypto.tink.mac"><span class="typeNameLink">MacKey</span></a>
 <ul>
@@ -521,7 +529,11 @@
 <li type="circle">com.google.crypto.tink.<a href="com/google/crypto/tink/NoSecretKeysetHandle.html" title="class in com.google.crypto.tink"><span class="typeNameLink">NoSecretKeysetHandle</span></a></li>
 <li type="circle">com.google.crypto.tink.<a href="com/google/crypto/tink/Parameters.html" title="class in com.google.crypto.tink"><span class="typeNameLink">Parameters</span></a>
 <ul>
-<li type="circle">com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AeadParameters.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AeadParameters</span></a></li>
+<li type="circle">com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AeadParameters.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AeadParameters</span></a>
+<ul>
+<li type="circle">com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/AesEaxParameters.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">AesEaxParameters</span></a></li>
+</ul>
+</li>
 <li type="circle">com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/LegacyProtoParameters.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">LegacyProtoParameters</span></a></li>
 <li type="circle">com.google.crypto.tink.mac.<a href="com/google/crypto/tink/mac/MacParameters.html" title="class in com.google.crypto.tink.mac"><span class="typeNameLink">MacParameters</span></a>
 <ul>
@@ -877,13 +889,12 @@
 <ul>
 <li type="circle">com.google.crypto.tink.<a href="com/google/crypto/tink/PemKeyType.html" title="enum in com.google.crypto.tink"><span class="typeNameLink">PemKeyType</span></a></li>
 <li type="circle">com.google.crypto.tink.<a href="com/google/crypto/tink/KeyTemplate.OutputPrefixType.html" title="enum in com.google.crypto.tink"><span class="typeNameLink">KeyTemplate.OutputPrefixType</span></a></li>
-<li type="circle">com.google.crypto.tink.config.internal.<a href="com/google/crypto/tink/config/internal/TinkFipsUtil.AlgorithmFipsCompatibility.html" title="enum in com.google.crypto.tink.config.internal"><span class="typeNameLink">TinkFipsUtil.AlgorithmFipsCompatibility</span></a></li>
+<li type="circle">com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey"><span class="typeNameLink">KeyHandle.KeyStatusType</span></a></li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/PemKeyType.html" title="enum in com.google.crypto.tink.subtle"><span class="typeNameLink">PemKeyType</span></a></li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/Enums.HashType.html" title="enum in com.google.crypto.tink.subtle"><span class="typeNameLink">Enums.HashType</span></a></li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/EllipticCurves.PointFormatType.html" title="enum in com.google.crypto.tink.subtle"><span class="typeNameLink">EllipticCurves.PointFormatType</span></a></li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/EllipticCurves.CurveType.html" title="enum in com.google.crypto.tink.subtle"><span class="typeNameLink">EllipticCurves.CurveType</span></a></li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/EllipticCurves.EcdsaEncoding.html" title="enum in com.google.crypto.tink.subtle"><span class="typeNameLink">EllipticCurves.EcdsaEncoding</span></a></li>
-<li type="circle">com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/KeyHandle.KeyStatusType.html" title="enum in com.google.crypto.tink.tinkkey"><span class="typeNameLink">KeyHandle.KeyStatusType</span></a></li>
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/JwtHmacAlgorithm.html" title="enum in com.google.crypto.tink.proto"><span class="typeNameLink">JwtHmacAlgorithm</span></a> (implements com.google.protobuf.ProtocolMessageEnum)</li>
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/JwtRsaSsaPssAlgorithm.html" title="enum in com.google.crypto.tink.proto"><span class="typeNameLink">JwtRsaSsaPssAlgorithm</span></a> (implements com.google.protobuf.ProtocolMessageEnum)</li>
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/JwtRsaSsaPkcs1Algorithm.html" title="enum in com.google.crypto.tink.proto"><span class="typeNameLink">JwtRsaSsaPkcs1Algorithm</span></a> (implements com.google.protobuf.ProtocolMessageEnum)</li>
@@ -898,6 +909,7 @@
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/OutputPrefixType.html" title="enum in com.google.crypto.tink.proto"><span class="typeNameLink">OutputPrefixType</span></a> (implements com.google.protobuf.ProtocolMessageEnum)</li>
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/KeyStatusType.html" title="enum in com.google.crypto.tink.proto"><span class="typeNameLink">KeyStatusType</span></a> (implements com.google.protobuf.ProtocolMessageEnum)</li>
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/KeyData.KeyMaterialType.html" title="enum in com.google.crypto.tink.proto"><span class="typeNameLink">KeyData.KeyMaterialType</span></a> (implements com.google.protobuf.ProtocolMessageEnum)</li>
+<li type="circle">com.google.crypto.tink.config.internal.<a href="com/google/crypto/tink/config/internal/TinkFipsUtil.AlgorithmFipsCompatibility.html" title="enum in com.google.crypto.tink.config.internal"><span class="typeNameLink">TinkFipsUtil.AlgorithmFipsCompatibility</span></a></li>
 </ul>
 </li>
 </ul>