Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions bun.lock
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"react": "19.1.0",
"react-native": "0.81.1",
"react-native-bouncy-checkbox": "4.1.2",
"react-native-nitro-modules": "0.26.4",
"react-native-nitro-modules": "0.29.1",
"react-native-quick-base64": "2.2.1",
"react-native-quick-crypto": "workspace:*",
"react-native-safe-area-context": "^5.2.2",
Expand Down Expand Up @@ -94,15 +94,15 @@
"del-cli": "6.0.0",
"expo": "^47.0.0",
"jest": "29.7.0",
"nitro-codegen": "0.26.4",
"nitro-codegen": "0.29.1",
"react-native-builder-bob": "0.39.1",
"react-native-nitro-modules": "0.26.4",
"react-native-nitro-modules": "0.29.1",
},
"peerDependencies": {
"expo": ">=47.0.0",
"react": "*",
"react-native": "*",
"react-native-nitro-modules": ">=0.26.4",
"react-native-nitro-modules": ">=0.29.1",
},
"optionalPeers": [
"expo",
Expand Down Expand Up @@ -1957,7 +1957,7 @@

"nice-try": ["[email protected]", "", {}, "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="],

"nitro-codegen": ["nitro-codegen@0.26.4", "", { "dependencies": { "chalk": "^5.3.0", "react-native-nitro-modules": "^0.26.4", "ts-morph": "^25.0.0", "yargs": "^17.7.2", "zod": "^4.0.5" }, "bin": { "nitro-codegen": "lib/index.js" } }, "sha512-qTOvyfE6+kz0wuqPpRlKc6F6ZNOI3elK7ltOTvxMZSG3Y8tt43UrV5xkp4XgL9Jc1P90iBLU6mDYRiNqoNA2+g=="],
"nitro-codegen": ["nitro-codegen@0.29.1", "", { "dependencies": { "chalk": "^5.3.0", "react-native-nitro-modules": "^0.29.1", "ts-morph": "^25.0.0", "yargs": "^17.7.2", "zod": "^4.0.5" }, "bin": { "nitro-codegen": "lib/index.js" } }, "sha512-jDGJckhFNwmpnZldwKNDDhawrfTwusd/0kcxkIf66yZkV3VXdw4TGpOSmpNtr4jfM+ZAGLDke4VcxJQow8FAag=="],

"nocache": ["[email protected]", "", {}, "sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw=="],

Expand Down Expand Up @@ -2189,7 +2189,7 @@

"react-native-is-edge-to-edge": ["[email protected]", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-FLbPWl/MyYQWz+KwqOZsSyj2JmLKglHatd3xLZWskXOpRaio4LfEDEz8E/A6uD8QoTHW6Aobw1jbEwK7KMgR7Q=="],

"react-native-nitro-modules": ["react-native-nitro-modules@0.26.4", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-sCZ0U+FY6JM73HaZYyc4kSRV7JQZXGfbimpYJzaAaZFQMGpJFkD5c3Jt66j1v83wN/m6D/SM9yyx+dN6XTfGAg=="],
"react-native-nitro-modules": ["react-native-nitro-modules@0.29.1", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-91A/Lc4Zc1Bvzj1iMSnD6vA5Swqv8aVcwGcv8ddjoPd9mahNvVS2arFh3o7kAqRH4RIh3KcQ0NpYslu7AYn55Q=="],

"react-native-quick-base64": ["[email protected]", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-r7/BRsRl8QKEhS0JsHW6QX9+8LrC6NNWlwNnBnZ69h2kbcfABYsUILT71obrs9fqElEIMzuYSI5aHID955akyQ=="],

Expand Down Expand Up @@ -3459,7 +3459,7 @@

"mv/rimraf": ["[email protected]", "", { "dependencies": { "glob": "^6.0.1" }, "bin": { "rimraf": "./bin.js" } }, "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ=="],

"nitro-codegen/chalk": ["chalk@5.4.1", "", {}, "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w=="],
"nitro-codegen/chalk": ["chalk@5.6.0", "", {}, "sha512-46QrSQFyVSEyYAgQ22hQ+zDa60YHA4fBstHmtSApj1Y5vKtG27fWowW03jCk5KcbXEWPZUIR894aARCA/G1kfQ=="],

"nitro-codegen/yargs": ["[email protected]", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="],

Expand Down
6 changes: 3 additions & 3 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PODS:
- hermes-engine (0.81.1):
- hermes-engine/Pre-built (= 0.81.1)
- hermes-engine/Pre-built (0.81.1)
- NitroModules (0.26.4):
- NitroModules (0.29.1):
- boost
- DoubleConversion
- fast_float
Expand Down Expand Up @@ -2744,7 +2744,7 @@ SPEC CHECKSUMS:
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
hermes-engine: 4f8246b1f6d79f625e0d99472d1f3a71da4d28ca
NitroModules: 697680c5a5fd4ecc62b728be573f26c7f5b602dd
NitroModules: 1715fe0e22defd9e2cdd48fb5e0dbfd01af54bec
OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2
QuickCrypto: d11c38c58b9736ced587e2999da13601b01501f9
RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
Expand Down Expand Up @@ -2817,6 +2817,6 @@ SPEC CHECKSUMS:
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Yoga: 11c9686a21e2cd82a094a723649d9f4507200fb0

PODFILE CHECKSUM: 800c5bf165ac9d74dcded58110e453f82283c73f
PODFILE CHECKSUM: 8bf59f4e86b38489f786b2878e119cdf1824ca75

COCOAPODS: 1.15.2
8 changes: 0 additions & 8 deletions example/ios/QuickCryptoExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-QuickCryptoExample/Pods-QuickCryptoExample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-QuickCryptoExample/Pods-QuickCryptoExample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QuickCryptoExample/Pods-QuickCryptoExample-frameworks.sh\"\n";
Expand Down Expand Up @@ -238,14 +234,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-QuickCryptoExample/Pods-QuickCryptoExample-resources-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-QuickCryptoExample/Pods-QuickCryptoExample-resources-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QuickCryptoExample/Pods-QuickCryptoExample-resources.sh\"\n";
Expand Down
4 changes: 2 additions & 2 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"format": "prettier --check \"**/*.{js,ts,tsx}\"",
"format:fix": "prettier --write \"**/*.{js,ts,tsx}\"",
"start": "react-native start",
"pods": "bundle exec pod install --project-directory=ios",
"pods": "RCT_USE_RN_DEP=1 RCT_USE_PREBUILT_RNCORE=1 bundle exec pod install --project-directory=ios",
"build:android": "cd android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a",
"build:ios": "cd ios && xcodebuild -workspace QuickCryptoExample.xcworkspace -scheme QuickCryptoExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO"
},
Expand All @@ -36,7 +36,7 @@
"react": "19.1.0",
"react-native": "0.81.1",
"react-native-bouncy-checkbox": "4.1.2",
"react-native-nitro-modules": "0.26.4",
"react-native-nitro-modules": "0.29.1",
"react-native-quick-base64": "2.2.1",
"react-native-quick-crypto": "workspace:*",
"react-native-safe-area-context": "^5.2.2",
Expand Down
6 changes: 2 additions & 4 deletions packages/react-native-quick-crypto/cpp/keys/KeyObjectData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
#include "Utils.hpp"
#include <optional>

namespace margelo {

using namespace margelo::nitro::crypto;
namespace margelo::nitro::crypto {

ncrypto::EVPKeyPointer::PrivateKeyEncodingConfig GetPrivateKeyEncodingConfig(KFormatType format, KeyEncoding type) {
auto pk_format = static_cast<ncrypto::EVPKeyPointer::PKFormatType>(format);
Expand Down Expand Up @@ -127,4 +125,4 @@ KeyObjectData KeyObjectData::GetPrivateKey(std::shared_ptr<ArrayBuffer> key, std
return TryParsePrivateKey(key, format, type, passphrase);
}

} // namespace margelo
} // namespace margelo::nitro::crypto
8 changes: 4 additions & 4 deletions packages/react-native-quick-crypto/cpp/keys/KeyObjectData.hpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#include <memory>

#include <NitroModules/ArrayBuffer.hpp>

#include "KFormatType.hpp"
#include "KeyEncoding.hpp"
#include "KeyType.hpp"
#include "Utils.hpp"
#include "ncrypto.h"

namespace margelo {

using namespace margelo::nitro;
namespace margelo::nitro::crypto {

class KeyObjectData final {
public:
Expand Down Expand Up @@ -68,4 +68,4 @@ class KeyObjectData final {
KeyObjectData(KeyType type, std::shared_ptr<Data> data) : key_type_(type), data_(data) {}
};

} // namespace margelo
} // namespace margelo::nitro::crypto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading