update master-with-bazel from master branch

BUILD.generated.bzl

@@ -171,13 +171,13 @@ crypto_headers = [
     "src/include/openssl/evp.h",
     "src/include/openssl/evp_errors.h",
     "src/include/openssl/ex_data.h",
+    "src/include/openssl/experimental/kyber.h",
     "src/include/openssl/hkdf.h",
     "src/include/openssl/hmac.h",
     "src/include/openssl/hpke.h",
     "src/include/openssl/hrss.h",
     "src/include/openssl/is_boringssl.h",
     "src/include/openssl/kdf.h",
-    "src/include/openssl/kyber.h",
     "src/include/openssl/lhash.h",
     "src/include/openssl/md4.h",
     "src/include/openssl/md5.h",

sources.json

@@ -405,13 +405,13 @@
     "src/include/openssl/evp.h", 
     "src/include/openssl/evp_errors.h", 
     "src/include/openssl/ex_data.h", 
+    "src/include/openssl/experimental/kyber.h", 
     "src/include/openssl/hkdf.h", 
     "src/include/openssl/hmac.h", 
     "src/include/openssl/hpke.h", 
     "src/include/openssl/hrss.h", 
     "src/include/openssl/is_boringssl.h", 
     "src/include/openssl/kdf.h", 
-    "src/include/openssl/kyber.h", 
     "src/include/openssl/lhash.h", 
     "src/include/openssl/md4.h", 
     "src/include/openssl/md5.h", 

src/API-CONVENTIONS.md

@@ -16,6 +16,9 @@ OpenSSL's legacy ASN.1, X.509, and PEM implementation. If possible, avoid using
 them. These are left largely unmodified from upstream and are retained only for
 compatibility with existing OpenSSL consumers.
 
+Experimental public APIs are found in `include/openssl/experimental`. Use of
+these will likely be incompatible with changes in the near future as they are
+finalized.
 
 ## Forward declarations
 

src/crypto/kyber/internal.h

@@ -16,7 +16,7 @@
 #define OPENSSL_HEADER_CRYPTO_KYBER_INTERNAL_H
 
 #include <openssl/base.h>
-#include <openssl/kyber.h>
+#include <openssl/experimental/kyber.h>
 
 #if defined(__cplusplus)
 extern "C" {

src/crypto/kyber/kyber.c

@@ -12,7 +12,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/kyber.h>
+#include <openssl/experimental/kyber.h>
 
 #include <assert.h>
 #include <stdlib.h>

src/crypto/kyber/kyber_test.cc

@@ -20,7 +20,7 @@
 
 #include <openssl/bytestring.h>
 #include <openssl/ctrdrbg.h>
-#include <openssl/kyber.h>
+#include <openssl/experimental/kyber.h>
 
 #include "../test/file_test.h"
 #include "../test/test_util.h"

src/ssl/ssl_key_share.cc

@@ -24,7 +24,7 @@
 #include <openssl/curve25519.h>
 #include <openssl/ec.h>
 #include <openssl/err.h>
-#include <openssl/kyber.h>
+#include <openssl/experimental/kyber.h>
 #include <openssl/hrss.h>
 #include <openssl/mem.h>
 #include <openssl/nid.h>

src/tool/speed.cc

@@ -38,8 +38,8 @@
 #include <openssl/ecdsa.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
+#include <openssl/experimental/kyber.h>
 #include <openssl/hrss.h>
-#include <openssl/kyber.h>
 #include <openssl/mem.h>
 #include <openssl/nid.h>
 #include <openssl/rand.h>

src/util/doc.config

@@ -36,7 +36,6 @@
       "include/openssl/engine.h",
       "include/openssl/hkdf.h",
       "include/openssl/hmac.h",
-      "include/openssl/kyber.h",
       "include/openssl/md5.h",
       "include/openssl/rc4.h",
       "include/openssl/rsa.h",
@@ -60,6 +59,11 @@
       "include/openssl/conf.h",
       "include/openssl/x509.h"
     ]
+  },{
+    "Name": "Experimental primitives. Will be removed and replaced when standardized!",
+    "Headers": [
+      "include/openssl/experimental/kyber.h"
+    ]
   },{
     "Name": "SSL implementation",
     "Headers": [