Skip to content

Commit 6b86ac9

Browse files
committed
chore: rebase hash PR
1 parent 6fe9f78 commit 6b86ac9

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

bun.lockb

-32 Bytes
Binary file not shown.

example/src/hooks/useTestsList.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import type { TestSuites } from '../types/tests';
33
import { TestsContext } from '../tests/util';
44

55
import '../tests/cipher/cipher_tests';
6-
import '../tests/hash/hash_tests';
76
import '../tests/ed25519/ed25519_tests';
7+
import '../tests/hash/hash_tests';
88
import '../tests/pbkdf2/pbkdf2_tests';
99
import '../tests/random/random_tests';
1010

packages/react-native-quick-crypto/android/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ add_library(
1010
${PACKAGE_NAME} SHARED
1111
src/main/cpp/cpp-adapter.cpp
1212
../cpp/cipher/HybridCipher.cpp
13-
../cpp/hash/HybridHash.cpp
1413
../cpp/ed25519/HybridEdKeyPair.cpp
14+
../cpp/hash/HybridHash.cpp
1515
../cpp/pbkdf2/HybridPbkdf2.cpp
1616
../cpp/random/HybridRandom.cpp
1717
../deps/fastpbkdf2/fastpbkdf2.c
@@ -24,8 +24,8 @@ include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/QuickCrypto+autolinkin
2424
include_directories(
2525
"src/main/cpp"
2626
"../cpp/cipher"
27-
"../cpp/hash"
2827
"../cpp/ed25519"
28+
"../cpp/hash"
2929
"../cpp/pbkdf2"
3030
"../cpp/random"
3131
"../cpp/utils"

packages/react-native-quick-crypto/nitro.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
},
1010
"autolinking": {
1111
"Cipher": { "cpp": "HybridCipher" },
12-
"Hash": { "cpp": "HybridHash" },
1312
"EdKeyPair": { "cpp": "HybridEdKeyPair" },
13+
"Hash": { "cpp": "HybridHash" },
1414
"Pbkdf2": { "cpp": "HybridPbkdf2" },
1515
"Random": { "cpp": "HybridRandom" }
1616
},

packages/react-native-quick-crypto/nitrogen/generated/android/QuickCryptoOnLoad.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include <NitroModules/HybridObjectRegistry.hpp>
1717

1818
#include "HybridCipher.hpp"
19-
#include "HybridHash.hpp"
2019
#include "HybridEdKeyPair.hpp"
20+
#include "HybridHash.hpp"
2121
#include "HybridPbkdf2.hpp"
2222
#include "HybridRandom.hpp"
2323

@@ -30,7 +30,7 @@ int initialize(JavaVM* vm) {
3030

3131
return facebook::jni::initialize(vm, [] {
3232
// Register native JNI methods
33-
33+
3434

3535
// Register Nitro Hybrid Objects
3636
HybridObjectRegistry::registerHybridObjectConstructor(
@@ -43,21 +43,21 @@ int initialize(JavaVM* vm) {
4343
}
4444
);
4545
HybridObjectRegistry::registerHybridObjectConstructor(
46-
"Hash",
46+
"EdKeyPair",
4747
[]() -> std::shared_ptr<HybridObject> {
48-
static_assert(std::is_default_constructible_v<HybridHash>,
49-
"The HybridObject \"HybridHash\" is not default-constructible! "
48+
static_assert(std::is_default_constructible_v<HybridEdKeyPair>,
49+
"The HybridObject \"HybridEdKeyPair\" is not default-constructible! "
5050
"Create a public constructor that takes zero arguments to be able to autolink this HybridObject.");
51-
return std::make_shared<HybridHash>();
51+
return std::make_shared<HybridEdKeyPair>();
5252
}
5353
);
5454
HybridObjectRegistry::registerHybridObjectConstructor(
55-
"EdKeyPair",
55+
"Hash",
5656
[]() -> std::shared_ptr<HybridObject> {
57-
static_assert(std::is_default_constructible_v<HybridEdKeyPair>,
58-
"The HybridObject \"HybridEdKeyPair\" is not default-constructible! "
57+
static_assert(std::is_default_constructible_v<HybridHash>,
58+
"The HybridObject \"HybridHash\" is not default-constructible! "
5959
"Create a public constructor that takes zero arguments to be able to autolink this HybridObject.");
60-
return std::make_shared<HybridEdKeyPair>();
60+
return std::make_shared<HybridHash>();
6161
}
6262
);
6363
HybridObjectRegistry::registerHybridObjectConstructor(

packages/react-native-quick-crypto/nitrogen/generated/ios/QuickCryptoAutolinking.mm

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#import <type_traits>
1212

1313
#include "HybridCipher.hpp"
14-
#include "HybridHash.hpp"
1514
#include "HybridEdKeyPair.hpp"
15+
#include "HybridHash.hpp"
1616
#include "HybridPbkdf2.hpp"
1717
#include "HybridRandom.hpp"
1818

@@ -35,21 +35,21 @@ + (void) load {
3535
}
3636
);
3737
HybridObjectRegistry::registerHybridObjectConstructor(
38-
"Hash",
38+
"EdKeyPair",
3939
[]() -> std::shared_ptr<HybridObject> {
40-
static_assert(std::is_default_constructible_v<HybridHash>,
41-
"The HybridObject \"HybridHash\" is not default-constructible! "
40+
static_assert(std::is_default_constructible_v<HybridEdKeyPair>,
41+
"The HybridObject \"HybridEdKeyPair\" is not default-constructible! "
4242
"Create a public constructor that takes zero arguments to be able to autolink this HybridObject.");
43-
return std::make_shared<HybridHash>();
43+
return std::make_shared<HybridEdKeyPair>();
4444
}
4545
);
4646
HybridObjectRegistry::registerHybridObjectConstructor(
47-
"EdKeyPair",
47+
"Hash",
4848
[]() -> std::shared_ptr<HybridObject> {
49-
static_assert(std::is_default_constructible_v<HybridEdKeyPair>,
50-
"The HybridObject \"HybridEdKeyPair\" is not default-constructible! "
49+
static_assert(std::is_default_constructible_v<HybridHash>,
50+
"The HybridObject \"HybridHash\" is not default-constructible! "
5151
"Create a public constructor that takes zero arguments to be able to autolink this HybridObject.");
52-
return std::make_shared<HybridEdKeyPair>();
52+
return std::make_shared<HybridHash>();
5353
}
5454
);
5555
HybridObjectRegistry::registerHybridObjectConstructor(

0 commit comments

Comments
 (0)