Move api/crypto.h|c++ to api/crypto/crypto.h|c++ (#2318)

cloudflare · Jun 24, 2024 · d64cc69 · d64cc69
1 parent bd09e5b
commit d64cc69
Show file tree

Hide file tree

Showing 26 changed files with 26 additions and 26 deletions.
diff --git a/src/workerd/api/api-rtti-test.c++ b/src/workerd/api/api-rtti-test.c++
@@ -6,7 +6,7 @@
 #include <workerd/api/actor.h>
 #include <workerd/api/actor-state.h>
 #include <workerd/api/cache.h>
-#include <workerd/api/crypto.h>
+#include <workerd/api/crypto/crypto.h>
 #include <workerd/api/encoding.h>
 #include <workerd/api/global-scope.h>
 #include <workerd/api/html-rewriter.h>

diff --git a/src/workerd/api/crypto-impl-aes-test.c++ → src/workerd/api/crypto/aes-test.c++ b/src/workerd/api/crypto-impl-aes-test.c++ → src/workerd/api/crypto/aes-test.c++
@@ -4,7 +4,7 @@
 
 #include <kj/test.h>
 
-#include "crypto-impl.h"
+#include "impl.h"
 #include "crypto.h"
 #include <workerd/api/util.h>
 #include <workerd/jsg/jsg.h>

diff --git a/src/workerd/api/crypto-impl-aes.c++ → src/workerd/api/crypto/aes.c++ b/src/workerd/api/crypto-impl-aes.c++ → src/workerd/api/crypto/aes.c++
@@ -2,7 +2,7 @@
 // Licensed under the Apache 2.0 license found in the LICENSE file or at:
 //     https://opensource.org/licenses/Apache-2.0
 
-#include "crypto-impl.h"
+#include "impl.h"
 #include <algorithm>
 #include <cstdint>
 #include <openssl/aes.h>

diff --git a/src/workerd/api/crypto-impl-asymmetric.c++ → src/workerd/api/crypto/asymmetric.c++ b/src/workerd/api/crypto-impl-asymmetric.c++ → src/workerd/api/crypto/asymmetric.c++
@@ -2,7 +2,7 @@
 // Licensed under the Apache 2.0 license found in the LICENSE file or at:
 //     https://opensource.org/licenses/Apache-2.0
 
-#include "crypto-impl.h"
+#include "impl.h"
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
 #include <openssl/ec_key.h>

diff --git a/src/workerd/api/crypto.c++ → src/workerd/api/crypto/crypto.c++ b/src/workerd/api/crypto.c++ → src/workerd/api/crypto/crypto.c++
@@ -3,13 +3,13 @@
 //     https://opensource.org/licenses/Apache-2.0
 
 #include "crypto.h"
-#include "crypto-impl.h"
-#include "streams/standard.h"
+#include "impl.h"
+#include "../streams/standard.h"
+#include "../util.h"
 #include <array>
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <workerd/jsg/jsg.h>
-#include "util.h"
 #include <workerd/io/io-context.h>
 #include <workerd/util/uuid.h>
 #include <set>

diff --git a/src/workerd/api/crypto.h → src/workerd/api/crypto/crypto.h b/src/workerd/api/crypto.h → src/workerd/api/crypto/crypto.h
@@ -11,7 +11,7 @@
 #include <workerd/jsg/jsg.h>
 #include <workerd/jsg/buffersource.h>
 #include <openssl/err.h>
-#include "streams.h"
+#include "../streams.h"
 
 namespace workerd::api {
 namespace node {

diff --git a/src/workerd/api/crypto-impl-hkdf.c++ → src/workerd/api/crypto/hkdf.c++ b/src/workerd/api/crypto-impl-hkdf.c++ → src/workerd/api/crypto/hkdf.c++
@@ -2,7 +2,7 @@
 // Licensed under the Apache 2.0 license found in the LICENSE file or at:
 //     https://opensource.org/licenses/Apache-2.0
 
-#include "crypto-impl.h"
+#include "impl.h"
 #include <openssl/crypto.h>
 #include <openssl/hkdf.h>
 

diff --git a/src/workerd/api/crypto-impl-hmac.c++ → src/workerd/api/crypto/hmac.c++ b/src/workerd/api/crypto-impl-hmac.c++ → src/workerd/api/crypto/hmac.c++
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 license found in the LICENSE file or at:
 //     https://opensource.org/licenses/Apache-2.0
 
-#include "crypto-impl.h"
-#include <workerd/api/crypto.h>
+#include "impl.h"
+#include <workerd/api/crypto/crypto.h>
 #include <workerd/io/io-context.h>
 #include <openssl/hmac.h>
 #include <openssl/mem.h>

diff --git a/src/workerd/api/crypto-impl-test.c++ → src/workerd/api/crypto/impl-test.c++ b/src/workerd/api/crypto-impl-test.c++ → src/workerd/api/crypto/impl-test.c++
@@ -4,7 +4,7 @@
 
 #include <kj/test.h>
 
-#include "crypto-impl.h"
+#include "impl.h"
 
 #include <openssl/err.h>
 #include <openssl/rsa.h>

diff --git a/src/workerd/api/crypto-impl.c++ → src/workerd/api/crypto/impl.c++ b/src/workerd/api/crypto-impl.c++ → src/workerd/api/crypto/impl.c++
@@ -2,7 +2,7 @@
 // Licensed under the Apache 2.0 license found in the LICENSE file or at:
 //     https://opensource.org/licenses/Apache-2.0
 
-#include "crypto-impl.h"
+#include "impl.h"
 #include "util.h"
 #include <algorithm>
 #include <map>

diff --git a/src/workerd/api/crypto-impl.h → src/workerd/api/crypto/impl.h b/src/workerd/api/crypto-impl.h → src/workerd/api/crypto/impl.h
diff --git a/src/workerd/api/crypto-impl-pbkdf2.c++ → src/workerd/api/crypto/pbkdf2.c++ b/src/workerd/api/crypto-impl-pbkdf2.c++ → src/workerd/api/crypto/pbkdf2.c++
@@ -2,7 +2,7 @@
 // Licensed under the Apache 2.0 license found in the LICENSE file or at:
 //     https://opensource.org/licenses/Apache-2.0
 
-#include "crypto-impl.h"
+#include "impl.h"
 #include <openssl/crypto.h>
 
 namespace workerd::api {

diff --git a/src/workerd/api/global-scope.c++ b/src/workerd/api/global-scope.c++
@@ -7,7 +7,7 @@
 #include <kj/encoding.h>
 
 #include <workerd/api/cache.h>
-#include <workerd/api/crypto.h>
+#include <workerd/api/crypto/crypto.h>
 #include <workerd/api/events.h>
 #include <workerd/api/scheduled.h>
 #include <workerd/api/system-streams.h>

diff --git a/src/workerd/api/node/crypto-dh.c++ b/src/workerd/api/node/crypto-dh.c++
@@ -6,7 +6,7 @@
 #include "crypto.h"
 #include <openssl/bn.h>
 #include <openssl/dh.h>
-#include <workerd/api/crypto-impl.h>
+#include <workerd/api/crypto/impl.h>
 #include <workerd/jsg/jsg.h>
 
 // Import DH primes if needed.

diff --git a/src/workerd/api/node/crypto-hash.c++ b/src/workerd/api/node/crypto-hash.c++
@@ -8,7 +8,7 @@
 #include <v8.h>
 #include <openssl/evp.h>
 #include <workerd/jsg/jsg.h>
-#include <workerd/api/crypto-impl.h>
+#include <workerd/api/crypto/impl.h>
 
 namespace workerd::api::node {
 jsg::Ref<CryptoImpl::HashHandle> CryptoImpl::HashHandle::constructor(

diff --git a/src/workerd/api/node/crypto-hkdf.c++ b/src/workerd/api/node/crypto-hkdf.c++
@@ -6,7 +6,7 @@
 #include "crypto.h"
 #include <workerd/jsg/jsg.h>
 #include <openssl/hkdf.h>
-#include <workerd/api/crypto-impl.h>
+#include <workerd/api/crypto/impl.h>
 
 namespace workerd::api::node {
 kj::Array<kj::byte> CryptoImpl::getHkdf(kj::String hash, kj::Array<kj::byte> key,

diff --git a/src/workerd/api/node/crypto-hmac.c++ b/src/workerd/api/node/crypto-hmac.c++
@@ -8,7 +8,7 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <workerd/jsg/jsg.h>
-#include <workerd/api/crypto-impl.h>
+#include <workerd/api/crypto/impl.h>
 
 namespace workerd::api::node {
 jsg::Ref<CryptoImpl::HmacHandle> CryptoImpl::HmacHandle::constructor(jsg::Lock& js,

diff --git a/src/workerd/api/node/crypto-keys.c++ b/src/workerd/api/node/crypto-keys.c++
@@ -1,5 +1,5 @@
 #include "crypto.h"
-#include <workerd/api/crypto-impl.h>
+#include <workerd/api/crypto/impl.h>
 #include <openssl/crypto.h>
 #include <map>
 

diff --git a/src/workerd/api/node/crypto-pbkdf2.c++ b/src/workerd/api/node/crypto-pbkdf2.c++
@@ -6,7 +6,7 @@
 #include "crypto.h"
 #include <openssl/evp.h>
 #include <workerd/jsg/jsg.h>
-#include <workerd/api/crypto-impl.h>
+#include <workerd/api/crypto/impl.h>
 
 namespace workerd::api::node {
 

diff --git a/src/workerd/api/node/crypto-random.c++ b/src/workerd/api/node/crypto-random.c++
@@ -9,7 +9,7 @@
 #include <openssl/bn.h>
 #include <openssl/rand.h>
 #include <workerd/jsg/jsg.h>
-#include <workerd/api/crypto-impl.h>
+#include <workerd/api/crypto/impl.h>
 
 namespace workerd::api::node {
   kj::Array<kj::byte> CryptoImpl::randomPrime(uint32_t size, bool safe,

diff --git a/src/workerd/api/node/crypto.h b/src/workerd/api/node/crypto.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <workerd/jsg/jsg.h>
-#include <workerd/api/crypto.h>
+#include <workerd/api/crypto/crypto.h>
 #include <openssl/evp.h>
 
 namespace workerd::api::node {

diff --git a/src/workerd/api/rtti.c++ b/src/workerd/api/rtti.c++
@@ -11,7 +11,7 @@
 #include <workerd/api/actor-state.h>
 #include <workerd/api/analytics-engine.h>
 #include <workerd/api/cache.h>
-#include <workerd/api/crypto.h>
+#include <workerd/api/crypto/crypto.h>
 #include <workerd/api/encoding.h>
 #include <workerd/api/events.h>
 #include <workerd/api/global-scope.h>

diff --git a/...orkerd/api/crypto-impl-asymmetric-test.js → .../api/tests/crypto-impl-asymmetric-test.js b/...orkerd/api/crypto-impl-asymmetric-test.js → .../api/tests/crypto-impl-asymmetric-test.js
diff --git a/...d/api/crypto-impl-asymmetric-test.wd-test → ...tests/crypto-impl-asymmetric-test.wd-test b/...d/api/crypto-impl-asymmetric-test.wd-test → ...tests/crypto-impl-asymmetric-test.wd-test
diff --git a/src/workerd/server/workerd-api.c++ b/src/workerd/server/workerd-api.c++
@@ -12,7 +12,7 @@
 #include <workerd/api/actor-state.h>
 #include <workerd/api/analytics-engine.h>
 #include <workerd/api/cache.h>
-#include <workerd/api/crypto-impl.h>
+#include <workerd/api/crypto/impl.h>
 #include <workerd/api/encoding.h>
 #include <workerd/api/events.h>
 #include <workerd/api/global-scope.h>

diff --git a/src/workerd/tools/api-encoder.c++ b/src/workerd/tools/api-encoder.c++
@@ -19,7 +19,7 @@
 #include <workerd/api/actor-state.h>
 #include <workerd/api/analytics-engine.h>
 #include <workerd/api/cache.h>
-#include <workerd/api/crypto.h>
+#include <workerd/api/crypto/crypto.h>
 #include <workerd/api/encoding.h>
 #include <workerd/api/events.h>
 #include <workerd/api/global-scope.h>