Skip to content

Commit 741a9b2

Browse files
snejsnej
committed
Use Monocypher directly, not Monocypher-Cpp wrapper lib
1 parent 17647d9 commit 741a9b2

File tree

7 files changed

+39
-126
lines changed

7 files changed

+39
-126
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
[submodule "vendor/sqlite3-unicodesn"]
2323
path = vendor/sqlite3-unicodesn
2424
url = https://github.com/couchbasedeps/sqlite3-unicodesn
25-
[submodule "vendor/monocypher-cpp"]
26-
path = vendor/monocypher-cpp
27-
url = https://github.com/snej/monocypher-cpp.git
25+
[submodule "vendor/Monocypher"]
26+
path = vendor/Monocypher
27+
url = https://github.com/LoupVaillant/Monocypher.git

‎CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,8 @@ target_include_directories(
286286
vendor/sqlite3-unicodesn
287287
vendor/mbedtls/include
288288
vendor/mbedtls/crypto/include
289-
vendor/monocypher-cpp/include
290-
vendor/monocypher-cpp/vendor/monocypher/src
291-
vendor/monocypher-cpp/vendor/monocypher/src/optionsl
289+
vendor/Monocypher/src
290+
vendor/Monocypher/src/optional
292291
vendor/sockpp/include
293292
)
294293

‎Crypto/Signing.cc‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include "Signing.hh"
2020
#include "Error.hh"
2121
#include "SecureRandomize.hh"
22-
#include "Monocypher.hh"
23-
#include "Monocypher-ed25519.hh"
22+
#include "monocypher.h"
23+
#include "monocypher-ed25519.h"
2424

2525
namespace litecore::crypto {
2626
using namespace std;
@@ -51,7 +51,7 @@ namespace litecore::crypto {
5151

5252
Ed25519VerifyingKey Ed25519SigningKey::publicKey() const{
5353
Ed25519VerifyingKey pub;
54-
monocypher::crypto_ed25519_public_key(pub._bytes.data(), _bytes.data());
54+
crypto_ed25519_public_key(pub._bytes.data(), _bytes.data());
5555
return pub;
5656
}
5757

@@ -62,10 +62,10 @@ namespace litecore::crypto {
6262

6363

6464
alloc_slice Ed25519SigningKey::sign(slice data) const {
65-
alloc_slice signature(sizeof(monocypher::signature<monocypher::Ed25519>));
66-
monocypher::crypto_ed25519_sign((uint8_t*)signature.buf,
67-
(const uint8_t*)_bytes.data(), nullptr,
68-
(const uint8_t*)data.buf, data.size);
65+
alloc_slice signature(64);
66+
crypto_ed25519_sign((uint8_t*)signature.buf,
67+
(const uint8_t*)_bytes.data(), nullptr,
68+
(const uint8_t*)data.buf, data.size);
6969
return signature;
7070
}
7171

@@ -76,12 +76,10 @@ namespace litecore::crypto {
7676
}
7777

7878
bool Ed25519VerifyingKey::verifySignature(slice inputData, slice signature) const {
79-
return 0 == monocypher::crypto_ed25519_check((const uint8_t*)signature.buf,
80-
(const uint8_t*)_bytes.data(),
81-
(const uint8_t*)inputData.buf,
82-
inputData.size);
79+
return 0 == crypto_ed25519_check((const uint8_t*)signature.buf,
80+
(const uint8_t*)_bytes.data(),
81+
(const uint8_t*)inputData.buf,
82+
inputData.size);
8383
}
8484

85-
86-
8785
}

‎Xcode/LiteCore.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,6 @@
161161
27469D09233D719800A1EE1A /* mbedUtils.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2762A01C22EB933100F9AB18 /* mbedUtils.cc */; };
162162
2746C8E62639E88700A3B2CC /* ThreadUtil.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2746C8E52639E88700A3B2CC /* ThreadUtil.cc */; };
163163
2747A0A327963F0B00F286AF /* SignedDict.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2747A09E27963F0A00F286AF /* SignedDict.cc */; };
164-
2747A1B327975EBE00F286AF /* monocypher-ed25519.c in Sources */ = {isa = PBXBuildFile; fileRef = 2747A18427975EBE00F286AF /* monocypher-ed25519.c */; };
165-
2747A1B427975EBE00F286AF /* monocypher.c in Sources */ = {isa = PBXBuildFile; fileRef = 2747A18527975EBE00F286AF /* monocypher.c */; };
166-
2747A1B527975EBE00F286AF /* chacha20.c in Sources */ = {isa = PBXBuildFile; fileRef = 2747A18827975EBE00F286AF /* chacha20.c */; };
167-
2747A1B627975EBE00F286AF /* aead-incr.c in Sources */ = {isa = PBXBuildFile; fileRef = 2747A18927975EBE00F286AF /* aead-incr.c */; };
168-
2747A1BA27975F1C00F286AF /* Monocypher-ed25519.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2747A1B827975F1C00F286AF /* Monocypher-ed25519.cc */; };
169-
2747A1BB27975F1C00F286AF /* Monocypher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2747A1B927975F1C00F286AF /* Monocypher.cc */; };
170164
2747A1BE2798847300F286AF /* SignatureTest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2747A1BD2798847300F286AF /* SignatureTest.cc */; };
171165
2747A1C12798920600F286AF /* Signing.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2747A1C02798920600F286AF /* Signing.cc */; };
172166
2747A1C22798920600F286AF /* Signing.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2747A1C02798920600F286AF /* Signing.cc */; };
@@ -229,6 +223,8 @@
229223
27727C55230F279D0082BCC9 /* HTTPLogic.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27727C53230F279D0082BCC9 /* HTTPLogic.cc */; };
230224
27766E161982DA8E00CAA464 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27766E151982DA8E00CAA464 /* Security.framework */; };
231225
2776AA272087FF6B004ACE85 /* LegacyAttachments.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2776AA252087FF6B004ACE85 /* LegacyAttachments.cc */; };
226+
277C5C3327A8864B001BE212 /* monocypher.c in Sources */ = {isa = PBXBuildFile; fileRef = 277C5C3227A8864B001BE212 /* monocypher.c */; settings = {COMPILER_FLAGS = "-Wno-shorten-64-to-32 -Wno-shadow"; }; };
227+
277C5C3627A88658001BE212 /* monocypher-ed25519.c in Sources */ = {isa = PBXBuildFile; fileRef = 277C5C3427A88658001BE212 /* monocypher-ed25519.c */; };
232228
2783DF991D27436700F84E6E /* c4ThreadingTest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2783DF981D27436700F84E6E /* c4ThreadingTest.cc */; };
233229
2787EB271F4C91B000DB97B0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27766E151982DA8E00CAA464 /* Security.framework */; };
234230
2787EB291F4C929C00DB97B0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27766E151982DA8E00CAA464 /* Security.framework */; };
@@ -1059,20 +1055,6 @@
10591055
2747664820190841007B39D1 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqlite3.h; sourceTree = "<group>"; };
10601056
2747A09E27963F0A00F286AF /* SignedDict.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SignedDict.cc; sourceTree = "<group>"; };
10611057
2747A0A227963F0B00F286AF /* SignedDict.hh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SignedDict.hh; sourceTree = "<group>"; };
1062-
2747A0A527975EBD00F286AF /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
1063-
2747A0AB27975EBD00F286AF /* Monocypher.hh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Monocypher.hh; sourceTree = "<group>"; };
1064-
2747A0AD27975EBD00F286AF /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
1065-
2747A18127975EBE00F286AF /* monocypher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = monocypher.h; sourceTree = "<group>"; };
1066-
2747A18327975EBE00F286AF /* monocypher-ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "monocypher-ed25519.h"; sourceTree = "<group>"; };
1067-
2747A18427975EBE00F286AF /* monocypher-ed25519.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "monocypher-ed25519.c"; sourceTree = "<group>"; };
1068-
2747A18527975EBE00F286AF /* monocypher.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = monocypher.c; sourceTree = "<group>"; };
1069-
2747A18727975EBE00F286AF /* aead-incr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "aead-incr.h"; sourceTree = "<group>"; };
1070-
2747A18827975EBE00F286AF /* chacha20.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = chacha20.c; sourceTree = "<group>"; };
1071-
2747A18927975EBE00F286AF /* aead-incr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "aead-incr.c"; sourceTree = "<group>"; };
1072-
2747A18A27975EBE00F286AF /* chacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chacha20.h; sourceTree = "<group>"; };
1073-
2747A1B827975F1C00F286AF /* Monocypher-ed25519.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Monocypher-ed25519.cc"; sourceTree = "<group>"; };
1074-
2747A1B927975F1C00F286AF /* Monocypher.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Monocypher.cc; sourceTree = "<group>"; };
1075-
2747A1BC27975F9E00F286AF /* Monocypher-ed25519.hh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = "Monocypher-ed25519.hh"; sourceTree = "<group>"; };
10761058
2747A1BD2798847300F286AF /* SignatureTest.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SignatureTest.cc; sourceTree = "<group>"; };
10771059
2747A1BF2798920600F286AF /* Signing.hh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Signing.hh; sourceTree = "<group>"; };
10781060
2747A1C02798920600F286AF /* Signing.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Signing.cc; sourceTree = "<group>"; };
@@ -1227,6 +1209,10 @@
12271209
2776AA262087FF6B004ACE85 /* LegacyAttachments.hh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = LegacyAttachments.hh; sourceTree = "<group>"; };
12281210
2777146C1C5D6BDB003C0287 /* static_lib.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = static_lib.xcconfig; sourceTree = "<group>"; };
12291211
2779CC6E1E85E4FC00F0D251 /* ReplicatorTypes.hh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ReplicatorTypes.hh; sourceTree = "<group>"; };
1212+
277C5C3127A8864B001BE212 /* monocypher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = monocypher.h; path = src/monocypher.h; sourceTree = "<group>"; };
1213+
277C5C3227A8864B001BE212 /* monocypher.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = monocypher.c; path = src/monocypher.c; sourceTree = "<group>"; };
1214+
277C5C3427A88658001BE212 /* monocypher-ed25519.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "monocypher-ed25519.c"; path = "src/optional/monocypher-ed25519.c"; sourceTree = "<group>"; };
1215+
277C5C3527A88658001BE212 /* monocypher-ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "monocypher-ed25519.h"; path = "src/optional/monocypher-ed25519.h"; sourceTree = "<group>"; };
12301216
277CB6251D0DED5E00702E56 /* Fleece.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Fleece.xcodeproj; path = fleece/Fleece.xcodeproj; sourceTree = "<group>"; };
12311217
277D19C9194E295B008E91EB /* Error.hh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Error.hh; sourceTree = "<group>"; };
12321218
277FEE5721ED10FA00B60E3C /* ReplicatorSGTest.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ReplicatorSGTest.cc; sourceTree = "<group>"; };
@@ -2160,83 +2146,6 @@
21602146
path = sqlite3;
21612147
sourceTree = "<group>";
21622148
};
2163-
2747A0A427975EBD00F286AF /* monocypher-cpp */ = {
2164-
isa = PBXGroup;
2165-
children = (
2166-
2747A0AD27975EBD00F286AF /* README.md */,
2167-
2747A0A527975EBD00F286AF /* CMakeLists.txt */,
2168-
2747A0AA27975EBD00F286AF /* include */,
2169-
2747A1B727975F1B00F286AF /* src */,
2170-
2747A0B327975EBD00F286AF /* vendor */,
2171-
);
2172-
path = "monocypher-cpp";
2173-
sourceTree = "<group>";
2174-
};
2175-
2747A0AA27975EBD00F286AF /* include */ = {
2176-
isa = PBXGroup;
2177-
children = (
2178-
2747A0AB27975EBD00F286AF /* Monocypher.hh */,
2179-
2747A1BC27975F9E00F286AF /* Monocypher-ed25519.hh */,
2180-
);
2181-
path = include;
2182-
sourceTree = "<group>";
2183-
};
2184-
2747A0B327975EBD00F286AF /* vendor */ = {
2185-
isa = PBXGroup;
2186-
children = (
2187-
2747A0B427975EBD00F286AF /* monocypher */,
2188-
);
2189-
path = vendor;
2190-
sourceTree = "<group>";
2191-
};
2192-
2747A0B427975EBD00F286AF /* monocypher */ = {
2193-
isa = PBXGroup;
2194-
children = (
2195-
2747A18027975EBE00F286AF /* src */,
2196-
);
2197-
path = monocypher;
2198-
sourceTree = "<group>";
2199-
};
2200-
2747A18027975EBE00F286AF /* src */ = {
2201-
isa = PBXGroup;
2202-
children = (
2203-
2747A18127975EBE00F286AF /* monocypher.h */,
2204-
2747A18227975EBE00F286AF /* optional */,
2205-
2747A18527975EBE00F286AF /* monocypher.c */,
2206-
2747A18627975EBE00F286AF /* deprecated */,
2207-
);
2208-
path = src;
2209-
sourceTree = "<group>";
2210-
};
2211-
2747A18227975EBE00F286AF /* optional */ = {
2212-
isa = PBXGroup;
2213-
children = (
2214-
2747A18327975EBE00F286AF /* monocypher-ed25519.h */,
2215-
2747A18427975EBE00F286AF /* monocypher-ed25519.c */,
2216-
);
2217-
path = optional;
2218-
sourceTree = "<group>";
2219-
};
2220-
2747A18627975EBE00F286AF /* deprecated */ = {
2221-
isa = PBXGroup;
2222-
children = (
2223-
2747A18727975EBE00F286AF /* aead-incr.h */,
2224-
2747A18827975EBE00F286AF /* chacha20.c */,
2225-
2747A18927975EBE00F286AF /* aead-incr.c */,
2226-
2747A18A27975EBE00F286AF /* chacha20.h */,
2227-
);
2228-
path = deprecated;
2229-
sourceTree = "<group>";
2230-
};
2231-
2747A1B727975F1B00F286AF /* src */ = {
2232-
isa = PBXGroup;
2233-
children = (
2234-
2747A1B827975F1C00F286AF /* Monocypher-ed25519.cc */,
2235-
2747A1B927975F1C00F286AF /* Monocypher.cc */,
2236-
);
2237-
path = src;
2238-
sourceTree = "<group>";
2239-
};
22402149
274D03FF1BA7554700FF7C35 /* tests */ = {
22412150
isa = PBXGroup;
22422151
children = (
@@ -2745,6 +2654,17 @@
27452654
name = Support;
27462655
sourceTree = "<group>";
27472656
};
2657+
277C5C3027A8861F001BE212 /* Monocypher */ = {
2658+
isa = PBXGroup;
2659+
children = (
2660+
277C5C3227A8864B001BE212 /* monocypher.c */,
2661+
277C5C3127A8864B001BE212 /* monocypher.h */,
2662+
277C5C3427A88658001BE212 /* monocypher-ed25519.c */,
2663+
277C5C3527A88658001BE212 /* monocypher-ed25519.h */,
2664+
);
2665+
path = Monocypher;
2666+
sourceTree = "<group>";
2667+
};
27482668
27A924951D9B316D00086206 /* LiteCore iOS */ = {
27492669
isa = PBXGroup;
27502670
children = (
@@ -2957,7 +2877,7 @@
29572877
277CB6251D0DED5E00702E56 /* Fleece.xcodeproj */,
29582878
275E6B9C22C2A3860032362A /* ios-cmake */,
29592879
2771A01F2284EA9F00B18E0A /* mbedtls */,
2960-
2747A0A427975EBD00F286AF /* monocypher-cpp */,
2880+
277C5C3027A8861F001BE212 /* Monocypher */,
29612881
27AFF38F23036A7100B4D6C4 /* socketpp */,
29622882
27EF7FFA1914296D00A327B9 /* sqlite3-unicodesn */,
29632883
27D74A731D4D3F0700D806E0 /* SQLiteCpp */,
@@ -4324,7 +4244,6 @@
43244244
27E3DD371DB450B300F2872D /* Logging.cc in Sources */,
43254245
27FC8DB622135BCE0083B033 /* ChangesFeed.cc in Sources */,
43264246
27E35AC81E942D6100E103F9 /* IncomingRev.cc in Sources */,
4327-
2747A1B327975EBE00F286AF /* monocypher-ed25519.c in Sources */,
43284247
2744B35B241854F2005A194D /* MessageBuilder.cc in Sources */,
43294248
2744B356241854F2005A194D /* GCDMailbox.cc in Sources */,
43304249
27E48713192171EA007D8940 /* DataFile.cc in Sources */,
@@ -4349,9 +4268,7 @@
43494268
27FA568424AD0E9300B2F1F8 /* Pusher+Attachments.cc in Sources */,
43504269
93CD01101E933BE100AFB3FA /* Checkpoint.cc in Sources */,
43514270
27D74A6F1D4D3DF500D806E0 /* SQLiteDataFile.cc in Sources */,
4352-
2747A1B527975EBE00F286AF /* chacha20.c in Sources */,
43534271
2744B350241854F2005A194D /* WebSocketInterface.cc in Sources */,
4354-
2747A1B627975EBE00F286AF /* aead-incr.c in Sources */,
43554272
27D74A841D4D3F2300D806E0 /* Transaction.cpp in Sources */,
43564273
274D17822177ECCC007FD01A /* QueryParser+Prediction.cc in Sources */,
43574274
27D74A9F1D4FF65000D806E0 /* c4Base.cc in Sources */,
@@ -4367,7 +4284,6 @@
43674284
2743E35625F85F26006F696D /* c4Replicator_CAPI.cc in Sources */,
43684285
27DF46C41A12CF46007BB4A4 /* Record.cc in Sources */,
43694286
27E4872B1923F24D007D8940 /* RevTreeRecord.cc in Sources */,
4370-
2747A1BB27975F1C00F286AF /* Monocypher.cc in Sources */,
43714287
27229278260D1ADF00A3A41F /* c4Collection.cc in Sources */,
43724288
276CE6832267991500B681AC /* n1ql.cc in Sources */,
43734289
93CD010F1E933BE100AFB3FA /* Pusher.cc in Sources */,
@@ -4393,7 +4309,6 @@
43934309
2716F91F248578D000BE21D9 /* mbedSnippets.cc in Sources */,
43944310
27229215260AB89900A3A41F /* BlobStreams.cc in Sources */,
43954311
272F00F62273D45000E62F72 /* LiveQuerier.cc in Sources */,
4396-
2747A1BA27975F1C00F286AF /* Monocypher-ed25519.cc in Sources */,
43974312
278963671D7B7E7D00493096 /* Stream.cc in Sources */,
43984313
27B699E11F27B85900782145 /* SQLiteFleeceUtil.cc in Sources */,
43994314
27E3DD581DB8524300F2872D /* DatabaseImpl.cc in Sources */,
@@ -4403,6 +4318,7 @@
44034318
27E487231922A64F007D8940 /* RevTree.cc in Sources */,
44044319
27E89BA61D679542002C32B3 /* FilePath.cc in Sources */,
44054320
279C18F01DF2051600D3221D /* SQLiteFTSRankFunction.cc in Sources */,
4321+
277C5C3327A8864B001BE212 /* monocypher.c in Sources */,
44064322
27E6DFF01DA5AFF3008EB681 /* Query.cc in Sources */,
44074323
27D74A7E1D4D3F2300D806E0 /* Database.cpp in Sources */,
44084324
27ADA79B1F2BF64100D9DE25 /* UnicodeCollator.cc in Sources */,
@@ -4412,6 +4328,7 @@
44124328
274EDDF61DA30B43003AD158 /* QueryParser.cc in Sources */,
44134329
273E9F741C51612E003115A6 /* c4DocEnumerator.cc in Sources */,
44144330
270C6B8C1EBA2CD600E73415 /* LogEncoder.cc in Sources */,
4331+
277C5C3627A88658001BE212 /* monocypher-ed25519.c in Sources */,
44154332
27D9655F2335667A00F4A51C /* SecureRandomize.cc in Sources */,
44164333
273D25F62564666A008643D2 /* VectorDocument.cc in Sources */,
44174334
27CCD4AF2315DB11003DEB99 /* Address.cc in Sources */,
@@ -4428,7 +4345,6 @@
44284345
27F0426C2196264900D7C6FA /* SQLiteDataFile+Indexes.cc in Sources */,
44294346
27FA568924AD0F8E00B2F1F8 /* Pusher+Revs.cc in Sources */,
44304347
278963621D7A376900493096 /* EncryptedStream.cc in Sources */,
4431-
2747A1B427975EBE00F286AF /* monocypher.c in Sources */,
44324348
72A3AF891F424EC0001E16D4 /* PrebuiltCopier.cc in Sources */,
44334349
93CD010B1E933BE100AFB3FA /* Worker.cc in Sources */,
44344350
27098AC02175279F002751DA /* SQLiteKeyStore+ArrayIndexes.cc in Sources */,

‎cmake/platform_base.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ function(set_litecore_source_base)
8484
LiteCore/Storage/UnicodeCollator.cc
8585
Networking/Address.cc
8686
Networking/HTTP/CookieStore.cc
87-
vendor/monocypher-cpp/src/Monocypher.cc
88-
vendor/monocypher-cpp/src/Monocypher-ed25519.cc
87+
vendor/Monocypher/src/monocypher.c
88+
vendor/Monocypher/src/optional/monocypher-ed25519.c
8989
vendor/SQLiteCpp/src/Backup.cpp
9090
vendor/SQLiteCpp/src/Column.cpp
9191
vendor/SQLiteCpp/src/Database.cpp

‎vendor/Monocypher‎

Submodule Monocypher added at baca5d3

‎vendor/monocypher-cpp‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)