From 0ff4c82c4d63d6a52a8ded7463e0ca92cd76bfd3 Mon Sep 17 00:00:00 2001
From: Tink Team <noreply@google.com>
Date: Tue, 29 Oct 2024 14:10:56 +0000
Subject: [PATCH] tink-HEAD-SNAPSHOT Javadoc auto-pushed to gh-pages

---
 .../tink/HEAD-SNAPSHOT/allclasses-frame.html  |   5 +-
 .../HEAD-SNAPSHOT/allclasses-noframe.html     |   5 +-
 .../internal/LegacyFullHybridEncrypt.html     |   4 +-
 ...19Jce.KeyPair.html => X25519.KeyPair.html} |  42 +--
 .../crypto/tink/hybrid/internal/X25519.html   | 277 ++++++++++++++++++
 .../{X25519Jce.html => X25519Conscrypt.html}  | 162 +++++-----
 ...19Jce.KeyPair.html => X25519.KeyPair.html} |  34 ++-
 .../hybrid/internal/class-use/X25519.html     | 178 +++++++++++
 .../{X25519Jce.html => X25519Conscrypt.html}  |  20 +-
 .../tink/hybrid/internal/package-frame.html   |   5 +-
 .../tink/hybrid/internal/package-summary.html |  14 +-
 .../tink/hybrid/internal/package-tree.html    |   5 +-
 .../tink/hybrid/internal/package-use.html     |   9 +-
 .../tink/HEAD-SNAPSHOT/constant-values.html   |  21 --
 javadoc/tink/HEAD-SNAPSHOT/index-all.html     |  42 +--
 javadoc/tink/HEAD-SNAPSHOT/overview-tree.html |   5 +-
 16 files changed, 631 insertions(+), 197 deletions(-)
 rename javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/{X25519Jce.KeyPair.html => X25519.KeyPair.html} (84%)
 create mode 100644 javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519.html
 rename javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/{X25519Jce.html => X25519Conscrypt.html} (60%)
 rename javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/{X25519Jce.KeyPair.html => X25519.KeyPair.html} (69%)
 create mode 100644 javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519.html
 rename javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/{X25519Jce.html => X25519Conscrypt.html} (84%)

diff --git a/javadoc/tink/HEAD-SNAPSHOT/allclasses-frame.html b/javadoc/tink/HEAD-SNAPSHOT/allclasses-frame.html
index d1a21664..92744895 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/allclasses-frame.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/allclasses-frame.html
@@ -848,9 +848,10 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="com/google/crypto/tink/subtle/Validators.html" title="class in com.google.crypto.tink.subtle" target="classFrame">Validators</a></li>
 <li><a href="com/google/crypto/tink/jwt/VerifiedJwt.html" title="class in com.google.crypto.tink.jwt" target="classFrame">VerifiedJwt</a></li>
 <li><a href="com/google/crypto/tink/Version.html" title="class in com.google.crypto.tink" target="classFrame">Version</a></li>
+<li><a href="com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal" target="classFrame"><span class="interfaceName">X25519</span></a></li>
 <li><a href="com/google/crypto/tink/subtle/X25519.html" title="class in com.google.crypto.tink.subtle" target="classFrame">X25519</a></li>
-<li><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal" target="classFrame">X25519Jce</a></li>
-<li><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal" target="classFrame">X25519Jce.KeyPair</a></li>
+<li><a href="com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal" target="classFrame">X25519.KeyPair</a></li>
+<li><a href="com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal" target="classFrame">X25519Conscrypt</a></li>
 <li><a href="com/google/crypto/tink/aead/internal/XAesGcm.html" title="class in com.google.crypto.tink.aead.internal" target="classFrame">XAesGcm</a></li>
 <li><a href="com/google/crypto/tink/proto/XAesGcm.html" title="class in com.google.crypto.tink.proto" target="classFrame">XAesGcm</a></li>
 <li><a href="com/google/crypto/tink/aead/XAesGcmKey.html" title="class in com.google.crypto.tink.aead" target="classFrame">XAesGcmKey</a></li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/allclasses-noframe.html b/javadoc/tink/HEAD-SNAPSHOT/allclasses-noframe.html
index aae839d1..df335ce0 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/allclasses-noframe.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/allclasses-noframe.html
@@ -848,9 +848,10 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="com/google/crypto/tink/subtle/Validators.html" title="class in com.google.crypto.tink.subtle">Validators</a></li>
 <li><a href="com/google/crypto/tink/jwt/VerifiedJwt.html" title="class in com.google.crypto.tink.jwt">VerifiedJwt</a></li>
 <li><a href="com/google/crypto/tink/Version.html" title="class in com.google.crypto.tink">Version</a></li>
+<li><a href="com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal"><span class="interfaceName">X25519</span></a></li>
 <li><a href="com/google/crypto/tink/subtle/X25519.html" title="class in com.google.crypto.tink.subtle">X25519</a></li>
-<li><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce</a></li>
-<li><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a></li>
+<li><a href="com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></li>
+<li><a href="com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Conscrypt</a></li>
 <li><a href="com/google/crypto/tink/aead/internal/XAesGcm.html" title="class in com.google.crypto.tink.aead.internal">XAesGcm</a></li>
 <li><a href="com/google/crypto/tink/proto/XAesGcm.html" title="class in com.google.crypto.tink.proto">XAesGcm</a></li>
 <li><a href="com/google/crypto/tink/aead/XAesGcmKey.html" title="class in com.google.crypto.tink.aead">XAesGcmKey</a></li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/LegacyFullHybridEncrypt.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/LegacyFullHybridEncrypt.html
index 2fc23f35..5fc0295b 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/LegacyFullHybridEncrypt.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/LegacyFullHybridEncrypt.html
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/LegacyFullHybridDecrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/LegacyFullHybridEncrypt.html" target="_top">Frames</a></li>
@@ -239,7 +239,7 @@ <h4>encrypt</h4>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/LegacyFullHybridDecrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/LegacyFullHybridEncrypt.html" target="_top">Frames</a></li>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html
similarity index 84%
rename from javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html
rename to javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html
index 482150a7..97ecba07 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>X25519Jce.KeyPair</title>
+<title>X25519.KeyPair</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="X25519Jce.KeyPair";
+            parent.document.title="X25519.KeyPair";
         }
     }
     catch(err) {
@@ -33,7 +33,7 @@
 <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/X25519Jce.KeyPair.html">Use</a></li>
+<li><a href="class-use/X25519.KeyPair.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>
@@ -42,12 +42,12 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" target="_top">Frames</a></li>
-<li><a href="X25519Jce.KeyPair.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" target="_top">Frames</a></li>
+<li><a href="X25519.KeyPair.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>
@@ -86,14 +86,14 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">com.google.crypto.tink.hybrid.internal</div>
-<h2 title="Class X25519Jce.KeyPair" class="title">Class X25519Jce.KeyPair</h2>
+<h2 title="Class X25519.KeyPair" class="title">Class X25519.KeyPair</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.hybrid.internal.X25519Jce.KeyPair</li>
+<li>com.google.crypto.tink.hybrid.internal.X25519.KeyPair</li>
 </ul>
 </li>
 </ul>
@@ -101,14 +101,14 @@ <h2 title="Class X25519Jce.KeyPair" class="title">Class X25519Jce.KeyPair</h2>
 <ul class="blockList">
 <li class="blockList">
 <dl>
-<dt>Enclosing class:</dt>
-<dd><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce</a></dd>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a></dd>
 </dl>
 <hr>
 <br>
-<pre>public static final class <span class="typeNameLabel">X25519Jce.KeyPair</span>
+<pre>public static final class <span class="typeNameLabel">X25519.KeyPair</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 X25519 key pair.</div>
+<div class="block">Keypair.</div>
 </li>
 </ul>
 </div>
@@ -129,11 +129,11 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html#privateKey">privateKey</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html#privateKey">privateKey</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html#publicKey">publicKey</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html#publicKey">publicKey</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -150,7 +150,7 @@ <h3>Constructor Summary</h3>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html#KeyPair-byte:A-byte:A-">KeyPair</a></span>(byte[]&nbsp;privateKey,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html#KeyPair-byte:A-byte:A-">KeyPair</a></span>(byte[]&nbsp;privateKey,
        byte[]&nbsp;publicKey)</code>&nbsp;</td>
 </tr>
 </table>
@@ -238,7 +238,7 @@ <h4>KeyPair</h4>
 <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/X25519Jce.KeyPair.html">Use</a></li>
+<li><a href="class-use/X25519.KeyPair.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>
@@ -247,12 +247,12 @@ <h4>KeyPair</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" target="_top">Frames</a></li>
-<li><a href="X25519Jce.KeyPair.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" target="_top">Frames</a></li>
+<li><a href="X25519.KeyPair.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>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519.html
new file mode 100644
index 00000000..f07b406a
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519.html
@@ -0,0 +1,277 @@
+<!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>X25519</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="X25519";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/X25519.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/hybrid/internal/LegacyFullHybridEncrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/X25519.html" target="_top">Frames</a></li>
+<li><a href="X25519.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.hybrid.internal</div>
+<h2 title="Interface X25519" class="title">Interface X25519</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Conscrypt</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">X25519</span></pre>
+<div class="block">Interface for X25519.</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">Interface 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/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></span></code>
+<div class="block">Keypair.</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="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>
+<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>byte[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html#computeSharedSecret-byte:A-byte:A-">computeSharedSecret</a></span>(byte[]&nbsp;privateValue,
+                   byte[]&nbsp;peersPublicValue)</code>
+<div class="block">computeSharedSecret.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html#generateKeyPair--">generateKeyPair</a></span>()</code>
+<div class="block">generateKeyPair.</div>
+</td>
+</tr>
+</table>
+</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="generateKeyPair--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>generateKeyPair</h4>
+<pre><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a>&nbsp;generateKeyPair()
+                        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">generateKeyPair.</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="computeSharedSecret-byte:A-byte:A-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>computeSharedSecret</h4>
+<pre>byte[]&nbsp;computeSharedSecret(byte[]&nbsp;privateValue,
+                           byte[]&nbsp;peersPublicValue)
+                    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">computeSharedSecret.</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>
+</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/X25519.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/hybrid/internal/LegacyFullHybridEncrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/X25519.html" target="_top">Frames</a></li>
+<li><a href="X25519.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/hybrid/internal/X25519Jce.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html
similarity index 60%
rename from javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519Jce.html
rename to javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html
index ed9a60c0..12699b4f 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519Jce.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>X25519Jce</title>
+<title>X25519Conscrypt</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="X25519Jce";
+            parent.document.title="X25519Conscrypt";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":10,"i1":9,"i2":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";
@@ -39,7 +39,7 @@
 <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/X25519Jce.html">Use</a></li>
+<li><a href="class-use/X25519Conscrypt.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>
@@ -48,12 +48,12 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/LegacyFullHybridEncrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/X25519Jce.html" target="_top">Frames</a></li>
-<li><a href="X25519Jce.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" target="_top">Frames</a></li>
+<li><a href="X25519Conscrypt.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>
@@ -73,14 +73,14 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&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><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
@@ -92,25 +92,30 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">com.google.crypto.tink.hybrid.internal</div>
-<h2 title="Class X25519Jce" class="title">Class X25519Jce</h2>
+<h2 title="Class X25519Conscrypt" class="title">Class X25519Conscrypt</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.hybrid.internal.X25519Jce</li>
+<li>com.google.crypto.tink.hybrid.internal.X25519Conscrypt</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public final class <span class="typeNameLabel">X25519Jce</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">X25519 implementation using JCE.
+<pre>public final class <span class="typeNameLabel">X25519Conscrypt</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>
+implements <a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a></pre>
+<div class="block">X25519 implementation using Conscrypt.
 
  <p>We use the PKCS8 and X509 encodings of the private and the public keys, because they are
  supported by all JCE implementations and they are easier to convert from and to their raw 32-byte
@@ -127,38 +132,13 @@ <h2 title="Class X25519Jce" class="title">Class X25519Jce</h2>
 <!--   -->
 </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/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a></span></code>
-<div class="block">An X25519 key pair.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="nested.classes.inherited.from.class.com.google.crypto.tink.hybrid.internal.X25519">
 <!--   -->
 </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 int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html#PRIVATE_KEY_LEN">PRIVATE_KEY_LEN</a></span></code>&nbsp;</td>
-</tr>
-</table>
+<h3>Nested classes/interfaces inherited from interface&nbsp;com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a></h3>
+<code><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></code></li>
+</ul>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
@@ -168,24 +148,26 @@ <h3>Field Summary</h3>
 </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="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 byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html#computeSharedSecret-byte:A-byte:A-">computeSharedSecret</a></span>(byte[]&nbsp;privateValue,
-                   byte[]&nbsp;peersPublicValue)</code>&nbsp;</td>
+<td class="colFirst"><code>byte[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html#computeSharedSecret-byte:A-byte:A-">computeSharedSecret</a></span>(byte[]&nbsp;privateValue,
+                   byte[]&nbsp;peersPublicValue)</code>
+<div class="block">computeSharedSecret.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html#generateKeyPair--">generateKeyPair</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static <a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html#create--">create</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html#isSupported--">isSupported</a></span>()</code>
-<div class="block">Returns true if the JCE supports X25519.</div>
+<td class="colFirst"><code><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html#generateKeyPair--">generateKeyPair</a></span>()</code>
+<div class="block">generateKeyPair.</div>
 </td>
 </tr>
 </table>
@@ -204,44 +186,24 @@ <h3>Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com
 <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="PRIVATE_KEY_LEN">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>PRIVATE_KEY_LEN</h4>
-<pre>public static final&nbsp;int PRIVATE_KEY_LEN</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../../constant-values.html#com.google.crypto.tink.hybrid.internal.X25519Jce.PRIVATE_KEY_LEN">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
 <li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="isSupported--">
+<a name="create--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>isSupported</h4>
-<pre>public static&nbsp;boolean&nbsp;isSupported()</pre>
-<div class="block">Returns true if the JCE supports X25519.
-
- <p>We do not support PKCS8 V2 defined in RFC 5958. If the provider uses that encoding, this
- function will return false.</div>
+<h4>create</h4>
+<pre>public static&nbsp;<a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a>&nbsp;create()
+                     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>
 <a name="generateKeyPair--">
@@ -250,9 +212,13 @@ <h4>isSupported</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>generateKeyPair</h4>
-<pre>public static&nbsp;<a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a>&nbsp;generateKeyPair()
-                                         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>
+<pre>public&nbsp;<a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a>&nbsp;generateKeyPair()
+                               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="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html#generateKeyPair--">X25519</a></code></span></div>
+<div class="block">generateKeyPair.</div>
 <dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html#generateKeyPair--">generateKeyPair</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a></code></dd>
 <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>
@@ -264,10 +230,14 @@ <h4>generateKeyPair</h4>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>computeSharedSecret</h4>
-<pre>public static&nbsp;byte[]&nbsp;computeSharedSecret(byte[]&nbsp;privateValue,
-                                         byte[]&nbsp;peersPublicValue)
-                                  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>
+<pre>public&nbsp;byte[]&nbsp;computeSharedSecret(byte[]&nbsp;privateValue,
+                                  byte[]&nbsp;peersPublicValue)
+                           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="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html#computeSharedSecret-byte:A-byte:A-">X25519</a></code></span></div>
+<div class="block">computeSharedSecret.</div>
 <dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html#computeSharedSecret-byte:A-byte:A-">computeSharedSecret</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a></code></dd>
 <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>
@@ -292,7 +262,7 @@ <h4>computeSharedSecret</h4>
 <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/X25519Jce.html">Use</a></li>
+<li><a href="class-use/X25519Conscrypt.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>
@@ -301,12 +271,12 @@ <h4>computeSharedSecret</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/LegacyFullHybridEncrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/X25519Jce.html" target="_top">Frames</a></li>
-<li><a href="X25519Jce.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" target="_top">Frames</a></li>
+<li><a href="X25519Conscrypt.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>
@@ -326,14 +296,14 @@ <h4>computeSharedSecret</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&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><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519Jce.KeyPair.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519.KeyPair.html
similarity index 69%
rename from javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519Jce.KeyPair.html
rename to javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519.KeyPair.html
index cc818f0c..f7f7ca7a 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519Jce.KeyPair.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519.KeyPair.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Uses of Class com.google.crypto.tink.hybrid.internal.X25519Jce.KeyPair</title>
+<title>Uses of Class com.google.crypto.tink.hybrid.internal.X25519.KeyPair</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class com.google.crypto.tink.hybrid.internal.X25519Jce.KeyPair";
+            parent.document.title="Uses of Class com.google.crypto.tink.hybrid.internal.X25519.KeyPair";
         }
     }
     catch(err) {
@@ -32,7 +32,7 @@
 <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/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">Class</a></li>
+<li><a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.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>
@@ -46,8 +46,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?com/google/crypto/tink/hybrid/internal/class-use/X25519Jce.KeyPair.html" target="_top">Frames</a></li>
-<li><a href="X25519Jce.KeyPair.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?com/google/crypto/tink/hybrid/internal/class-use/X25519.KeyPair.html" target="_top">Frames</a></li>
+<li><a href="X25519.KeyPair.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>
@@ -69,13 +69,13 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class com.google.crypto.tink.hybrid.internal.X25519Jce.KeyPair" class="title">Uses of Class<br>com.google.crypto.tink.hybrid.internal.X25519Jce.KeyPair</h2>
+<h2 title="Uses of Class com.google.crypto.tink.hybrid.internal.X25519.KeyPair" class="title">Uses of Class<br>com.google.crypto.tink.hybrid.internal.X25519.KeyPair</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/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Packages that use <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Package</th>
 <th class="colLast" scope="col">Description</th>
@@ -93,17 +93,23 @@ <h2 title="Uses of Class com.google.crypto.tink.hybrid.internal.X25519Jce.KeyPai
 <li class="blockList"><a name="com.google.crypto.tink.hybrid.internal">
 <!--   -->
 </a>
-<h3>Uses of <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a> in <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</a></h3>
+<h3>Uses of <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a> in <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</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/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</a> that return <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Methods in <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</a> that return <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</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/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a></code></td>
-<td class="colLast"><span class="typeNameLabel">X25519Jce.</span><code><span class="memberNameLink"><a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html#generateKeyPair--">generateKeyPair</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code><a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></code></td>
+<td class="colLast"><span class="typeNameLabel">X25519Conscrypt.</span><code><span class="memberNameLink"><a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html#generateKeyPair--">generateKeyPair</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></code></td>
+<td class="colLast"><span class="typeNameLabel">X25519.</span><code><span class="memberNameLink"><a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html#generateKeyPair--">generateKeyPair</a></span>()</code>
+<div class="block">generateKeyPair.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -123,7 +129,7 @@ <h3>Uses of <a href="../../../../../../../com/google/crypto/tink/hybrid/internal
 <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/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">Class</a></li>
+<li><a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.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>
@@ -137,8 +143,8 @@ <h3>Uses of <a href="../../../../../../../com/google/crypto/tink/hybrid/internal
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?com/google/crypto/tink/hybrid/internal/class-use/X25519Jce.KeyPair.html" target="_top">Frames</a></li>
-<li><a href="X25519Jce.KeyPair.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?com/google/crypto/tink/hybrid/internal/class-use/X25519.KeyPair.html" target="_top">Frames</a></li>
+<li><a href="X25519.KeyPair.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>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519.html
new file mode 100644
index 00000000..8f5e7ef3
--- /dev/null
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519.html
@@ -0,0 +1,178 @@
+<!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 Interface com.google.crypto.tink.hybrid.internal.X25519</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 Interface com.google.crypto.tink.hybrid.internal.X25519";
+        }
+    }
+    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/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.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/hybrid/internal/class-use/X25519.html" target="_top">Frames</a></li>
+<li><a href="X25519.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 Interface com.google.crypto.tink.hybrid.internal.X25519" class="title">Uses of Interface<br>com.google.crypto.tink.hybrid.internal.X25519</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/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</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.hybrid.internal">com.google.crypto.tink.hybrid.internal</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.hybrid.internal">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a> in <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</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/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</a> that implement <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</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/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Conscrypt</a></span></code>
+<div class="block">X25519 implementation using Conscrypt.</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/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</a> that return <a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</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/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a></code></td>
+<td class="colLast"><span class="typeNameLabel">X25519Conscrypt.</span><code><span class="memberNameLink"><a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html#create--">create</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/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.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/hybrid/internal/class-use/X25519.html" target="_top">Frames</a></li>
+<li><a href="X25519.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/hybrid/internal/class-use/X25519Jce.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519Conscrypt.html
similarity index 84%
rename from javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519Jce.html
rename to javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519Conscrypt.html
index 08dddb6f..53aa7a01 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519Jce.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/class-use/X25519Conscrypt.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Uses of Class com.google.crypto.tink.hybrid.internal.X25519Jce</title>
+<title>Uses of Class com.google.crypto.tink.hybrid.internal.X25519Conscrypt</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class com.google.crypto.tink.hybrid.internal.X25519Jce";
+            parent.document.title="Uses of Class com.google.crypto.tink.hybrid.internal.X25519Conscrypt";
         }
     }
     catch(err) {
@@ -32,7 +32,7 @@
 <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/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal">Class</a></li>
+<li><a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.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>
@@ -46,8 +46,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?com/google/crypto/tink/hybrid/internal/class-use/X25519Jce.html" target="_top">Frames</a></li>
-<li><a href="X25519Jce.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?com/google/crypto/tink/hybrid/internal/class-use/X25519Conscrypt.html" target="_top">Frames</a></li>
+<li><a href="X25519Conscrypt.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>
@@ -69,9 +69,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class com.google.crypto.tink.hybrid.internal.X25519Jce" class="title">Uses of Class<br>com.google.crypto.tink.hybrid.internal.X25519Jce</h2>
+<h2 title="Uses of Class com.google.crypto.tink.hybrid.internal.X25519Conscrypt" class="title">Uses of Class<br>com.google.crypto.tink.hybrid.internal.X25519Conscrypt</h2>
 </div>
-<div class="classUseContainer">No usage of com.google.crypto.tink.hybrid.internal.X25519Jce</div>
+<div class="classUseContainer">No usage of com.google.crypto.tink.hybrid.internal.X25519Conscrypt</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -83,7 +83,7 @@ <h2 title="Uses of Class com.google.crypto.tink.hybrid.internal.X25519Jce" class
 <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/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal">Class</a></li>
+<li><a href="../../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.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>
@@ -97,8 +97,8 @@ <h2 title="Uses of Class com.google.crypto.tink.hybrid.internal.X25519Jce" class
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?com/google/crypto/tink/hybrid/internal/class-use/X25519Jce.html" target="_top">Frames</a></li>
-<li><a href="X25519Jce.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?com/google/crypto/tink/hybrid/internal/class-use/X25519Conscrypt.html" target="_top">Frames</a></li>
+<li><a href="X25519Conscrypt.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>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-frame.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-frame.html
index f40baaba..6361f892 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-frame.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-frame.html
@@ -16,6 +16,7 @@ <h2 title="Interfaces">Interfaces</h2>
 <li><a href="HpkeAead.html" title="interface in com.google.crypto.tink.hybrid.internal" target="classFrame"><span class="interfaceName">HpkeAead</span></a></li>
 <li><a href="HpkeKdf.html" title="interface in com.google.crypto.tink.hybrid.internal" target="classFrame"><span class="interfaceName">HpkeKdf</span></a></li>
 <li><a href="HpkeKem.html" title="interface in com.google.crypto.tink.hybrid.internal" target="classFrame"><span class="interfaceName">HpkeKem</span></a></li>
+<li><a href="X25519.html" title="interface in com.google.crypto.tink.hybrid.internal" target="classFrame"><span class="interfaceName">X25519</span></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
@@ -32,8 +33,8 @@ <h2 title="Classes">Classes</h2>
 <li><a href="HpkeUtil.html" title="class in com.google.crypto.tink.hybrid.internal" target="classFrame">HpkeUtil</a></li>
 <li><a href="LegacyFullHybridDecrypt.html" title="class in com.google.crypto.tink.hybrid.internal" target="classFrame">LegacyFullHybridDecrypt</a></li>
 <li><a href="LegacyFullHybridEncrypt.html" title="class in com.google.crypto.tink.hybrid.internal" target="classFrame">LegacyFullHybridEncrypt</a></li>
-<li><a href="X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal" target="classFrame">X25519Jce</a></li>
-<li><a href="X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal" target="classFrame">X25519Jce.KeyPair</a></li>
+<li><a href="X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal" target="classFrame">X25519.KeyPair</a></li>
+<li><a href="X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal" target="classFrame">X25519Conscrypt</a></li>
 </ul>
 </div>
 </body>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-summary.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-summary.html
index b00cac13..8e70eb7a 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-summary.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-summary.html
@@ -106,6 +106,12 @@ <h1 title="Package" class="title">Package&nbsp;com.google.crypto.tink.hybrid.int
 <div class="block">Interface for Hybrid Public Key Encryption (HPKE) key encapsulation mechanism (KEM).</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a></td>
+<td class="colLast">
+<div class="block">Interface for X25519.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -197,15 +203,15 @@ <h1 title="Package" class="title">Package&nbsp;com.google.crypto.tink.hybrid.int
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce</a></td>
+<td class="colFirst"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></td>
 <td class="colLast">
-<div class="block">X25519 implementation using JCE.</div>
+<div class="block">Keypair.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a></td>
+<td class="colFirst"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Conscrypt</a></td>
 <td class="colLast">
-<div class="block">An X25519 key pair.</div>
+<div class="block">X25519 implementation using Conscrypt.</div>
 </td>
 </tr>
 </tbody>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-tree.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-tree.html
index 55bfada7..65e70f50 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-tree.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-tree.html
@@ -93,8 +93,8 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">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"><span class="typeNameLink">HpkeUtil</span></a></li>
 <li type="circle">com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/LegacyFullHybridDecrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">LegacyFullHybridDecrypt</span></a> (implements com.google.crypto.tink.<a href="../../../../../../com/google/crypto/tink/HybridDecrypt.html" title="interface in com.google.crypto.tink">HybridDecrypt</a>)</li>
 <li type="circle">com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/LegacyFullHybridEncrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">LegacyFullHybridEncrypt</span></a> (implements com.google.crypto.tink.<a href="../../../../../../com/google/crypto/tink/HybridEncrypt.html" title="interface in com.google.crypto.tink">HybridEncrypt</a>)</li>
-<li type="circle">com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519Jce</span></a></li>
-<li type="circle">com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519Jce.KeyPair</span></a></li>
+<li type="circle">com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519.KeyPair</span></a></li>
+<li type="circle">com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519Conscrypt</span></a> (implements com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a>)</li>
 </ul>
 </li>
 </ul>
@@ -104,6 +104,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li type="circle">com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/HpkeAead.html" title="interface in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">HpkeAead</span></a></li>
 <li type="circle">com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/HpkeKdf.html" title="interface in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">HpkeKdf</span></a></li>
 <li type="circle">com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/HpkeKem.html" title="interface in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">HpkeKem</span></a></li>
+<li type="circle">com.google.crypto.tink.hybrid.internal.<a href="../../../../../../com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519</span></a></li>
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
diff --git a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-use.html b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-use.html
index 6d894514..8fa2a661 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-use.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/com/google/crypto/tink/hybrid/internal/package-use.html
@@ -129,8 +129,13 @@ <h1 title="Uses of Package com.google.crypto.tink.hybrid.internal" class="title"
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/class-use/X25519Jce.KeyPair.html#com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a>
-<div class="block">An X25519 key pair.</div>
+<td class="colOne"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/class-use/X25519.html#com.google.crypto.tink.hybrid.internal">X25519</a>
+<div class="block">Interface for X25519.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../../com/google/crypto/tink/hybrid/internal/class-use/X25519.KeyPair.html#com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a>
+<div class="block">Keypair.</div>
 </td>
 </tr>
 </tbody>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/constant-values.html b/javadoc/tink/HEAD-SNAPSHOT/constant-values.html
index 1beb3612..10c7a1ed 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/constant-values.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/constant-values.html
@@ -256,27 +256,6 @@ <h2 title="com.google">com.google.*</h2>
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="com.google.crypto.tink.hybrid.internal.X25519Jce.PRIVATE_KEY_LEN">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html#PRIVATE_KEY_LEN">PRIVATE_KEY_LEN</a></code></td>
-<td class="colLast"><code>32</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/Ed25519.html" title="class in com.google.crypto.tink.internal">Ed25519</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/index-all.html b/javadoc/tink/HEAD-SNAPSHOT/index-all.html
index 881af3da..1732fc03 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/index-all.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/index-all.html
@@ -3882,7 +3882,11 @@ <h2 class="title">C</h2>
 <dd>
 <div class="block">Convenience method to compute the primary PRF on a given input.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html#computeSharedSecret-byte:A-byte:A-">computeSharedSecret(byte[], byte[])</a></span> - Static method in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce</a></dt>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519.html#computeSharedSecret-byte:A-byte:A-">computeSharedSecret(byte[], byte[])</a></span> - Method in interface com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a></dt>
+<dd>
+<div class="block">computeSharedSecret.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html#computeSharedSecret-byte:A-byte:A-">computeSharedSecret(byte[], byte[])</a></span> - Method in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Conscrypt</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/subtle/EllipticCurves.html#computeSharedSecret-java.security.interfaces.ECPrivateKey-java.security.interfaces.ECPublicKey-">computeSharedSecret(ECPrivateKey, ECPublicKey)</a></span> - Static method in class com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/EllipticCurves.html" title="class in com.google.crypto.tink.subtle">EllipticCurves</a></dt>
 <dd>&nbsp;</dd>
@@ -4021,6 +4025,8 @@ <h2 class="title">C</h2>
 <dd>
 <div class="block">This method covers the cases where users created their own aead/key classes.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html#create--">create()</a></span> - Static method in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Conscrypt</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/KeyParser.html#create-com.google.crypto.tink.internal.KeyParser.KeyParsingFunction-com.google.crypto.tink.util.Bytes-java.lang.Class-">create(KeyParser.KeyParsingFunction&lt;SerializationT&gt;, Bytes, Class&lt;SerializationT&gt;)</a></span> - Static method in class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/KeyParser.html" title="class in com.google.crypto.tink.internal">KeyParser</a></dt>
 <dd>
 <div class="block">Creates a KeyParser object.</div>
@@ -6227,7 +6233,11 @@ <h2 class="title">G</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/subtle/EciesHkdfSenderKem.html#generateKey-java.lang.String-byte:A-byte:A-int-com.google.crypto.tink.subtle.EllipticCurves.PointFormatType-">generateKey(String, byte[], byte[], int, EllipticCurves.PointFormatType)</a></span> - Method in class com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/EciesHkdfSenderKem.html" title="class in com.google.crypto.tink.subtle">EciesHkdfSenderKem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html#generateKeyPair--">generateKeyPair()</a></span> - Static method in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce</a></dt>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519.html#generateKeyPair--">generateKeyPair()</a></span> - Method in interface com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a></dt>
+<dd>
+<div class="block">generateKeyPair.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html#generateKeyPair--">generateKeyPair()</a></span> - Method in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Conscrypt</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/subtle/EllipticCurves.html#generateKeyPair-com.google.crypto.tink.subtle.EllipticCurves.CurveType-">generateKeyPair(EllipticCurves.CurveType)</a></span> - Static method in class com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/EllipticCurves.html" title="class in com.google.crypto.tink.subtle">EllipticCurves</a></dt>
 <dd>
@@ -18067,10 +18077,6 @@ <h2 class="title">I</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/internal/XChaCha20Poly1305Jce.html#isSupported--">isSupported()</a></span> - Static method in class com.google.crypto.tink.aead.internal.<a href="com/google/crypto/tink/aead/internal/XChaCha20Poly1305Jce.html" title="class in com.google.crypto.tink.aead.internal">XChaCha20Poly1305Jce</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html#isSupported--">isSupported()</a></span> - Static method in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce</a></dt>
-<dd>
-<div class="block">Returns true if the JCE supports X25519.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/signature/internal/Ed25519SignJce.html#isSupported--">isSupported()</a></span> - Static method in class com.google.crypto.tink.signature.internal.<a href="com/google/crypto/tink/signature/internal/Ed25519SignJce.html" title="class in com.google.crypto.tink.signature.internal">Ed25519SignJce</a></dt>
 <dd>
 <div class="block">Returns true if the JCE supports Ed25519.</div>
@@ -18750,7 +18756,7 @@ <h2 class="title">K</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/internal/KeyManagerRegistry.html#KeyManagerRegistry--">KeyManagerRegistry()</a></span> - Constructor for class com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/KeyManagerRegistry.html" title="class in com.google.crypto.tink.internal">KeyManagerRegistry</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html#KeyPair-byte:A-byte:A-">KeyPair(byte[], byte[])</a></span> - Constructor for class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a></dt>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html#KeyPair-byte:A-byte:A-">KeyPair(byte[], byte[])</a></span> - Constructor for class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="com/google/crypto/tink/internal/KeyParser.html" title="class in com.google.crypto.tink.internal"><span class="typeNameLink">KeyParser</span></a>&lt;<a href="com/google/crypto/tink/internal/KeyParser.html" title="type parameter in KeyParser">SerializationT</a> extends <a href="com/google/crypto/tink/internal/Serialization.html" title="interface in com.google.crypto.tink.internal">Serialization</a>&gt; - Class in <a href="com/google/crypto/tink/internal/package-summary.html">com.google.crypto.tink.internal</a></dt>
 <dd>
@@ -24316,9 +24322,7 @@ <h2 class="title">P</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/proto/HpkePrivateKey.html#PRIVATE_KEY_FIELD_NUMBER">PRIVATE_KEY_FIELD_NUMBER</a></span> - Static variable in class com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/HpkePrivateKey.html" title="class in com.google.crypto.tink.proto">HpkePrivateKey</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html#PRIVATE_KEY_LEN">PRIVATE_KEY_LEN</a></span> - Static variable in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html#privateKey">privateKey</a></span> - Variable in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a></dt>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html#privateKey">privateKey</a></span> - Variable in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="com/google/crypto/tink/PrivateKey.html" title="interface in com.google.crypto.tink"><span class="typeNameLink">PrivateKey</span></a> - Interface in <a href="com/google/crypto/tink/package-summary.html">com.google.crypto.tink</a></dt>
 <dd>
@@ -24429,7 +24433,7 @@ <h2 class="title">P</h2>
 <div class="block">Returns the 32-byte Diffie-Hellman public value based on the given <code>privateKey</code> (i.e.,
  <code>privateKey</code>·[9] on the curve).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html#publicKey">publicKey</a></span> - Variable in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519Jce.KeyPair</a></dt>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html#publicKey">publicKey</a></span> - Variable in class com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal">X25519.KeyPair</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/jwt/JwtEcdsaPrivateKey.html#publicKey">publicKey</a></span> - Variable in class com.google.crypto.tink.jwt.<a href="com/google/crypto/tink/jwt/JwtEcdsaPrivateKey.html" title="class in com.google.crypto.tink.jwt">JwtEcdsaPrivateKey</a></dt>
 <dd>&nbsp;</dd>
@@ -30028,20 +30032,24 @@ <h2 class="title">X</h2>
 <dl>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/EciesParameters.CurveType.html#X25519">X25519</a></span> - Static variable in class com.google.crypto.tink.hybrid.<a href="com/google/crypto/tink/hybrid/EciesParameters.CurveType.html" title="class in com.google.crypto.tink.hybrid">EciesParameters.CurveType</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519</span></a> - Interface in <a href="com/google/crypto/tink/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</a></dt>
+<dd>
+<div class="block">Interface for X25519.</div>
+</dd>
 <dt><a href="com/google/crypto/tink/subtle/X25519.html" title="class in com.google.crypto.tink.subtle"><span class="typeNameLink">X25519</span></a> - Class in <a href="com/google/crypto/tink/subtle/package-summary.html">com.google.crypto.tink.subtle</a></dt>
 <dd>
 <div class="block">Defines <a href="https://cr.yp.to/ecdh/curve25519-20060209.pdf">the ECDH Curve25519 function</a>,
  also known as the X25519 function.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/HpkeUtil.html#X25519_HKDF_SHA256_KEM_ID">X25519_HKDF_SHA256_KEM_ID</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/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519Jce</span></a> - Class in <a href="com/google/crypto/tink/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</a></dt>
+<dt><a href="com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519.KeyPair</span></a> - Class in <a href="com/google/crypto/tink/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</a></dt>
 <dd>
-<div class="block">X25519 implementation using JCE.</div>
+<div class="block">Keypair.</div>
 </dd>
-<dt><a href="com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519Jce.KeyPair</span></a> - Class in <a href="com/google/crypto/tink/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</a></dt>
+<dt><span class="memberNameLink"><a href="com/google/crypto/tink/hybrid/internal/HpkeUtil.html#X25519_HKDF_SHA256_KEM_ID">X25519_HKDF_SHA256_KEM_ID</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/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519Conscrypt</span></a> - Class in <a href="com/google/crypto/tink/hybrid/internal/package-summary.html">com.google.crypto.tink.hybrid.internal</a></dt>
 <dd>
-<div class="block">An X25519 key pair.</div>
+<div class="block">X25519 implementation using Conscrypt.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/google/crypto/tink/aead/PredefinedAeadParameters.html#X_AES_GCM_8_BYTE_SALT_NO_PREFIX">X_AES_GCM_8_BYTE_SALT_NO_PREFIX</a></span> - Static variable in class com.google.crypto.tink.aead.<a href="com/google/crypto/tink/aead/PredefinedAeadParameters.html" title="class in com.google.crypto.tink.aead">PredefinedAeadParameters</a></dt>
 <dd>
diff --git a/javadoc/tink/HEAD-SNAPSHOT/overview-tree.html b/javadoc/tink/HEAD-SNAPSHOT/overview-tree.html
index 4cf25bfb..978bf455 100644
--- a/javadoc/tink/HEAD-SNAPSHOT/overview-tree.html
+++ b/javadoc/tink/HEAD-SNAPSHOT/overview-tree.html
@@ -917,8 +917,8 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">com.google.crypto.tink.jwt.<a href="com/google/crypto/tink/jwt/VerifiedJwt.html" title="class in com.google.crypto.tink.jwt"><span class="typeNameLink">VerifiedJwt</span></a></li>
 <li type="circle">com.google.crypto.tink.<a href="com/google/crypto/tink/Version.html" title="class in com.google.crypto.tink"><span class="typeNameLink">Version</span></a></li>
 <li type="circle">com.google.crypto.tink.subtle.<a href="com/google/crypto/tink/subtle/X25519.html" title="class in com.google.crypto.tink.subtle"><span class="typeNameLink">X25519</span></a></li>
-<li type="circle">com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Jce.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519Jce</span></a></li>
-<li type="circle">com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Jce.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519Jce.KeyPair</span></a></li>
+<li type="circle">com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519.KeyPair.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519.KeyPair</span></a></li>
+<li type="circle">com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519Conscrypt.html" title="class in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519Conscrypt</span></a> (implements com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal">X25519</a>)</li>
 <li type="circle">com.google.crypto.tink.proto.<a href="com/google/crypto/tink/proto/XAesGcm.html" title="class in com.google.crypto.tink.proto"><span class="typeNameLink">XAesGcm</span></a></li>
 <li type="circle">com.google.crypto.tink.aead.internal.<a href="com/google/crypto/tink/aead/internal/XAesGcm.html" title="class in com.google.crypto.tink.aead.internal"><span class="typeNameLink">XAesGcm</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/XAesGcmKeyManager.html" title="class in com.google.crypto.tink.aead"><span class="typeNameLink">XAesGcmKeyManager</span></a></li>
@@ -1191,6 +1191,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li type="circle">com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/TinkBugException.ThrowingRunnable.html" title="interface in com.google.crypto.tink.internal"><span class="typeNameLink">TinkBugException.ThrowingRunnable</span></a></li>
 <li type="circle">com.google.crypto.tink.internal.<a href="com/google/crypto/tink/internal/TinkBugException.ThrowingSupplier.html" title="interface in com.google.crypto.tink.internal"><span class="typeNameLink">TinkBugException.ThrowingSupplier</span></a>&lt;T&gt;</li>
 <li type="circle">com.google.crypto.tink.tinkkey.<a href="com/google/crypto/tink/tinkkey/TinkKey.html" title="interface in com.google.crypto.tink.tinkkey"><span class="typeNameLink">TinkKey</span></a></li>
+<li type="circle">com.google.crypto.tink.hybrid.internal.<a href="com/google/crypto/tink/hybrid/internal/X25519.html" title="interface in com.google.crypto.tink.hybrid.internal"><span class="typeNameLink">X25519</span></a></li>
 </ul>
 <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 <ul>