rpms
/
cjdns
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New upstream release

This commit is contained in:
Stuart D. Gathman 2020-12-16 14:29:47 -05:00
parent 657e7a189e
commit 872b9dad8e
6 changed files with 39 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -18,3 +18,4 @@
/cjdns-v20.7.tar.gz
/cjdns-v21.tar.gz
/python-cjdns-0.2.tar.gz
/cjdns-v21.1.tar.gz

14
cjdns.32bit.patch
View File

@ -1,14 +0,0 @@
diff -up ./memory/Allocator.c.32bit ./memory/Allocator.c
--- ./memory/Allocator.c.32bit 2020-09-29 14:10:32.115169486 -0400
+++ ./memory/Allocator.c 2020-09-29 14:16:54.682448839 -0400
@@ -59,8 +59,8 @@ static void unroll(struct Allocator_pvt*
writeUnroller(&childUnroller);
fprintf(stderr, "%s:%ld [%lu] bytes at [0x%lx]\n",
allocation->fileName,
- allocation->lineNum,
- allocation->pub.size,
+ (long)allocation->lineNum,
+ (unsigned long)allocation->pub.size,
(long)(uintptr_t)allocation);
allocation = allocation->next;
}

37
cjdns.sign.patch
View File

@ -1,40 +1,3 @@
diff -up ./crypto/CryptoAuth.c.sign ./crypto/CryptoAuth.c
--- ./crypto/CryptoAuth.c.sign 2020-09-18 14:24:44.000000000 -0400
+++ ./crypto/CryptoAuth.c 2020-09-29 10:32:39.040375439 -0400
@@ -85,8 +85,10 @@ static inline void getSharedSecret(uint8
uint8_t passwordHash[32],
struct Log* logger)
{
+ int keygenfailed;
if (passwordHash == NULL) {
- crypto_box_curve25519xsalsa20poly1305_beforenm(outputSecret, herPublicKey, myPrivateKey);
+ keygenfailed = crypto_box_curve25519xsalsa20poly1305_beforenm(
+ outputSecret, herPublicKey, myPrivateKey);
} else {
union {
struct {
@@ -96,7 +98,8 @@ static inline void getSharedSecret(uint8
uint8_t bytes[64];
} buff;
- crypto_scalarmult_curve25519(buff.components.key, myPrivateKey, herPublicKey);
+ keygenfailed = crypto_scalarmult_curve25519(
+ buff.components.key, myPrivateKey, herPublicKey);
Bits_memcpy(buff.components.passwd, passwordHash, 32);
crypto_hash_sha256(outputSecret, buff.bytes, 64);
}
@@ -114,8 +117,9 @@ static inline void getSharedSecret(uint8
" myPublicKey=%s\n"
" herPublicKey=%s\n"
" passwordHash=%s\n"
- " outputSecret=%s\n",
- myPublicKeyHex, herPublicKeyHex, passwordHashHex, outputSecretHex);
+ " outputSecret=%s\n"
+ " keygenfailed=%d\n",
+ myPublicKeyHex, herPublicKeyHex, passwordHashHex, outputSecretHex,keygenfailed);
}
}
diff -up ./crypto/Sign.c.sign ./crypto/Sign.c
--- ./crypto/Sign.c.sign 2020-09-18 14:24:44.000000000 -0400
+++ ./crypto/Sign.c 2020-09-29 10:25:02.503986487 -0400

56
cjdns.sodium.patch
View File

@ -1,6 +1,6 @@
diff -up ./client/cjdroute2.c.sodium ./client/cjdroute2.c
--- ./client/cjdroute2.c.sodium 2020-09-28 22:33:15.839316844 -0400
+++ ./client/cjdroute2.c 2020-09-28 22:34:40.219680315 -0400
--- ./client/cjdroute2.c.sodium 2020-12-16 14:14:51.140783237 -0500
+++ ./client/cjdroute2.c 2020-12-16 14:14:51.146783327 -0500
@@ -64,6 +64,7 @@
#include <string.h>
#include <time.h>
@ -9,7 +9,7 @@ diff -up ./client/cjdroute2.c.sodium ./client/cjdroute2.c
#define DEFAULT_TUN_DEV "tun0"
@@ -598,6 +599,9 @@ static String* getPipePath(Dict* config,
@@ -597,6 +598,9 @@ static String* getPipePath(Dict* config,
int main(int argc, char** argv)
{
@ -20,8 +20,8 @@ diff -up ./client/cjdroute2.c.sodium ./client/cjdroute2.c
fprintf(stderr, "Log_LEVEL = KEYS, EXPECT TO SEE PRIVATE KEYS IN YOUR LOGS!\n");
#endif
diff -up ./contrib/c/makekeys.c.sodium ./contrib/c/makekeys.c
--- ./contrib/c/makekeys.c.sodium 2020-09-18 14:24:44.000000000 -0400
+++ ./contrib/c/makekeys.c 2020-09-28 22:33:15.853317070 -0400
--- ./contrib/c/makekeys.c.sodium 2020-10-05 17:46:19.000000000 -0400
+++ ./contrib/c/makekeys.c 2020-12-16 14:14:51.147783342 -0500
@@ -22,9 +22,13 @@
#include <signal.h>
@ -37,8 +37,8 @@ diff -up ./contrib/c/makekeys.c.sodium ./contrib/c/makekeys.c
struct Random* rand = Random_new(alloc, NULL, NULL);
diff -up ./contrib/c/mkpasswd.c.sodium ./contrib/c/mkpasswd.c
--- ./contrib/c/mkpasswd.c.sodium 2020-09-18 14:24:44.000000000 -0400
+++ ./contrib/c/mkpasswd.c 2020-09-28 22:33:15.853317070 -0400
--- ./contrib/c/mkpasswd.c.sodium 2020-10-05 17:46:19.000000000 -0400
+++ ./contrib/c/mkpasswd.c 2020-12-16 14:14:51.147783342 -0500
@@ -18,9 +18,13 @@
#include <stdio.h>
@ -54,8 +54,8 @@ diff -up ./contrib/c/mkpasswd.c.sodium ./contrib/c/mkpasswd.c
struct Random* rand = Random_new(alloc, NULL, NULL);
diff -up ./contrib/c/privatetopublic.c.sodium ./contrib/c/privatetopublic.c
--- ./contrib/c/privatetopublic.c.sodium 2020-09-18 14:24:44.000000000 -0400
+++ ./contrib/c/privatetopublic.c 2020-09-28 22:33:15.853317070 -0400
--- ./contrib/c/privatetopublic.c.sodium 2020-10-05 17:46:19.000000000 -0400
+++ ./contrib/c/privatetopublic.c 2020-12-16 14:14:51.147783342 -0500
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <errno.h>
@ -75,8 +75,8 @@ diff -up ./contrib/c/privatetopublic.c.sodium ./contrib/c/privatetopublic.c
Hex_decode(privateKey, 32, privateKeyHexIn, 64);
crypto_scalarmult_curve25519_base(address.key, privateKey);
diff -up ./contrib/c/publictoip6.c.sodium ./contrib/c/publictoip6.c
--- ./contrib/c/publictoip6.c.sodium 2020-09-18 14:24:44.000000000 -0400
+++ ./contrib/c/publictoip6.c 2020-09-28 22:33:15.853317070 -0400
--- ./contrib/c/publictoip6.c.sodium 2020-10-05 17:46:19.000000000 -0400
+++ ./contrib/c/publictoip6.c 2020-12-16 14:14:51.147783342 -0500
@@ -16,6 +16,7 @@
#include "util/AddrTools.h"
#include "util/CString.h"
@ -96,8 +96,8 @@ diff -up ./contrib/c/publictoip6.c.sodium ./contrib/c/publictoip6.c
int ret = Key_parse(&key, keyBytes, ip6Bytes);
switch (ret) {
diff -up ./contrib/c/sybilsim.c.sodium ./contrib/c/sybilsim.c
--- ./contrib/c/sybilsim.c.sodium 2020-09-18 14:24:44.000000000 -0400
+++ ./contrib/c/sybilsim.c 2020-09-28 22:33:15.853317070 -0400
--- ./contrib/c/sybilsim.c.sodium 2020-10-05 17:46:19.000000000 -0400
+++ ./contrib/c/sybilsim.c 2020-12-16 14:14:51.148783357 -0500
@@ -42,6 +42,7 @@
#include "crypto_scalarmult_curve25519.h"
@ -117,8 +117,8 @@ diff -up ./contrib/c/sybilsim.c.sodium ./contrib/c/sybilsim.c
struct Allocator* alloc = MallocAllocator_new(1LL<<31);
diff -up ./crypto/random/randombytes.c.sodium ./crypto/random/randombytes.c
--- ./crypto/random/randombytes.c.sodium 2020-09-18 14:24:44.000000000 -0400
+++ ./crypto/random/randombytes.c 2020-09-28 22:33:15.853317070 -0400
--- ./crypto/random/randombytes.c.sodium 2020-10-05 17:46:19.000000000 -0400
+++ ./crypto/random/randombytes.c 2020-12-16 14:14:51.148783357 -0500
@@ -17,6 +17,7 @@
#include "memory/MallocAllocator.h"
@ -138,9 +138,9 @@ diff -up ./crypto/random/randombytes.c.sodium ./crypto/random/randombytes.c
Random_bytes(rand, str.buff, 4096);
out = write(STDOUT_FILENO, str.buff, 4096);
diff -up ./node_build/make.js.sodium ./node_build/make.js
--- ./node_build/make.js.sodium 2020-09-18 14:24:44.000000000 -0400
+++ ./node_build/make.js 2020-09-28 22:33:15.853317070 -0400
@@ -264,48 +264,8 @@ Builder.configure({
--- ./node_build/make.js.sodium 2020-10-05 17:46:19.000000000 -0400
+++ ./node_build/make.js 2020-12-16 14:15:59.646810621 -0500
@@ -251,49 +251,8 @@ Builder.configure({
}).nThen(function (waitFor) {
@ -157,15 +157,16 @@ diff -up ./node_build/make.js.sodium ./node_build/make.js
- var cwd = process.cwd();
- process.chdir(dependencyDir + '/cnacl/');
-
- // $FlowFixMe non-static require
- var NaCl = require(process.cwd() + '/node_build/make.js');
- NaCl.build(function (args, callback) {
- if (builder.config.systemName !== 'win32') {
- args.unshift('-fPIC');
- }
-
- args.unshift(builder.config.optimizeLevel, '-fomit-frame-pointer');
- args.unshift(optimizeLevel, '-fomit-frame-pointer');
-
- if (!/^\-O0$/.test(builder.config.optimizeLevel)) {
- if (!/^\-O0$/.test(optimizeLevel)) {
- args.unshift('-D_FORTIFY_SOURCE=2');
- }
-
@ -191,7 +192,7 @@ diff -up ./node_build/make.js.sodium ./node_build/make.js
}).nThen(function (waitFor) {
@@ -452,7 +412,7 @@ Builder.configure({
@@ -440,7 +399,7 @@ Builder.configure({
builder.buildExecutable('crypto/random/randombytes.c');
builder.lintFiles(function (fileName, file, callback) {
@ -200,9 +201,16 @@ diff -up ./node_build/make.js.sodium ./node_build/make.js
callback('', false);
return;
}
@@ -471,4 +430,4 @@ Builder.configure({
console.log('\x1b[1;31mFailed to build cjdns.\x1b[0m');
process.exit(1);
-});
\ No newline at end of file
+});
diff -up ./test/testcjdroute.c.sodium ./test/testcjdroute.c
--- ./test/testcjdroute.c.sodium 2020-09-28 22:33:15.854317087 -0400
+++ ./test/testcjdroute.c 2020-09-28 22:36:34.386525092 -0400
--- ./test/testcjdroute.c.sodium 2020-10-05 17:46:19.000000000 -0400
+++ ./test/testcjdroute.c 2020-12-16 14:14:51.148783357 -0500
@@ -26,6 +26,7 @@
#include <stdio.h>
#include <unistd.h>
@ -211,7 +219,7 @@ diff -up ./test/testcjdroute.c.sodium ./test/testcjdroute.c
#ifdef SUBNODE
#define testcjdroute_SUBNODE 1
@@ -272,6 +273,9 @@ static int main2(int argc, char** argv,
@@ -269,6 +270,9 @@ static int main2(int argc, char** argv,
int main(int argc, char** argv)
{

10
cjdns.spec
View File

@ -75,8 +75,8 @@
Name: cjdns
# major version is cjdns protocol version:
Version: 21
Release: 4%{?dist}
Version: 21.1
Release: 1%{?dist}
Summary: The privacy-friendly network without borders
# cjdns is all GPLv3 except libuv which is MIT and BSD and ISC
# cnacl is unused except when use_embedded is true
@ -141,8 +141,6 @@ Patch18: cjdns.libuv.patch
Patch20: cjdns.sysctl.patch
# gcc-10 no longer allows duplicate globals
Patch22: cjdns.gcc10.patch
# Patches for 32-bit builds
Patch23: cjdns.32bit.patch
%if %{use_marked}
BuildRequires: nodejs, nodejs-marked, python3
@ -323,7 +321,6 @@ sed -i -e '/optimizeLevel:/ s/-O0/-O3/' node_build/make.js
#patch19 -p1 -b .fuzz
#patch20 -p1 -b .sysctl
#patch22 -b .gcc10
%patch23 -b .32bit
%patch2 -b .warn
cp %{SOURCE1} README_Fedora.md
@ -727,6 +724,9 @@ fi
%{_bindir}/graphStats
%changelog
* Wed Dec 16 2020 Stuart Gathman <stuart@gathman.org> - 21.1-1
- New upstream release
* Wed Dec 16 2020 Stuart Gathman <stuart@gathman.org> - 21-4
- Support gcc-11, drop el6 support.

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (cjdns-v21.1.tar.gz) = 5a50b22ce018a8e799ebaa11c0c2998d8a75489c2e54da11b4d9f07f2b00073af34328c431b90afbe6e8796302f2137aa62625dcdd56c0cced785fc2b280ccf6
SHA512 (python-cjdns-0.2.tar.gz) = 3c1c90ee98c0ed03777efcb7bf147a4f32370b2803155bfc3dab37dc9367706b19b3aa328aba603fa589eaa21f3c6ce2df88826378d19436935a1bccebf5ffa0
SHA512 (cjdns-v21.tar.gz) = 2c0b80c715c8895b573c09787df8be9fcc721d0903c90a32649e22f72e2d7b0b13d4254f31936c61f47cdd1fee8e3cf4a28f827571f94972557258e4a42f9eb2