commit 2fb5cdb6c44506442fce110c2d3903a880888dfb
author Bob Beck <bbe@google.com> Wed Feb 21 22:17:12 2024 +0000
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Mar 06 00:02:56 2024 +0000
tree 3f3f5470a42e031dddf875c4c214b9de911ea9c5
parent 665194823b7e3973d988bc5d2ca1c2c635c1a4e8

Move spx from internal to include/openssl/experimental

Change-Id: I5c8db3bbca774c7f503538b43f79077421574b0f
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/66487
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Bob Beck <bbe@google.com>

crypto/spx/spx.c

diff --git a/crypto/spx/spx.c b/crypto/spx/spx.c
index 679a4a1..b5bec6e 100644
--- a/crypto/spx/spx.c
+++ b/crypto/spx/spx.c
@@ -16,11 +16,11 @@
 
 #include <string.h>
 
+#include <openssl/experimental/spx.h>
 #include <openssl/rand.h>
 
 #include "./address.h"
 #include "./fors.h"
-#include "./internal.h"
 #include "./merkle.h"
 #include "./params.h"
 #include "./spx_util.h"

crypto/spx/spx_test.cc

diff --git a/crypto/spx/spx_test.cc b/crypto/spx/spx_test.cc
index f4ebcea..313f47d 100644
--- a/crypto/spx/spx_test.cc
+++ b/crypto/spx/spx_test.cc
@@ -21,8 +21,8 @@
 
 #include <gtest/gtest.h>
 #include <openssl/bytestring.h>
+#include <openssl/experimental/spx.h>
 
-#include "./internal.h"
 #include "../test/file_test.h"
 #include "../test/test_util.h"
 

include/openssl/experimental/spx.h

diff --git a/crypto/spx/internal.h b/include/openssl/experimental/spx.h
similarity index 100%
rename from crypto/spx/internal.h
rename to include/openssl/experimental/spx.h

tool/speed.cc

diff --git a/tool/speed.cc b/tool/speed.cc
index a8c0587..d524455 100644
--- a/tool/speed.cc
+++ b/tool/speed.cc
@@ -39,6 +39,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/experimental/kyber.h>
+#include <openssl/experimental/spx.h>
 #include <openssl/hrss.h>
 #include <openssl/mem.h>
 #include <openssl/nid.h>
@@ -67,7 +68,6 @@
 #include "../crypto/fipsmodule/ec/internal.h"
 #include "../crypto/internal.h"
 #include "../crypto/trust_token/internal.h"
-#include "../crypto/spx/internal.h"
 #include "internal.h"
 
 // g_print_json is true if printed output is JSON formatted.

util/doc.config

diff --git a/util/doc.config b/util/doc.config
index ec640f5..213831a 100644
--- a/util/doc.config
+++ b/util/doc.config
@@ -62,7 +62,8 @@
   },{
     "Name": "Experimental primitives. Will be removed and replaced when standardized!",
     "Headers": [
-      "include/openssl/experimental/kyber.h"
+      "include/openssl/experimental/kyber.h",
+      "include/openssl/experimental/spx.h"
     ]
   },{
     "Name": "SSL implementation",