Skip to content

Commit f86d5d5

Browse files
mguetschowAnnsAnns
authored andcommitted
pkg/relic: bump version to 0.7.0
1 parent 152bfdf commit f86d5d5

File tree

6 files changed

+37
-22
lines changed

6 files changed

+37
-22
lines changed

pkg/relic/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
PKG_NAME=relic
22
PKG_URL=https://github.com/relic-toolkit/relic.git
3-
PKG_VERSION=e3f82e36250b228f3b4646781f6e06a8be497d18
3+
# version 0.7.0
4+
PKG_VERSION=e8b13783dbbe120cff5a68ff460f3bb9bec69666
45
PKG_LICENSE=LGPL-2.1
56

67
PKG_CUSTOM_PREPARED = $(BINDIR)/pkg-build/$(PKG_NAME)/include
@@ -13,7 +14,8 @@ CMAKE_MINIMAL_VERSION = 3.6.0
1314

1415
CFLAGS += -Wno-unused-function -Wno-old-style-definition -Wno-unused-parameter \
1516
-Wno-pedantic -Wno-array-parameter -Wno-unused-but-set-variable \
16-
-Wno-stringop-overflow
17+
-Wno-stringop-overflow -Wno-sign-compare -Wno-type-limits \
18+
-Wno-shift-count-overflow -Wno-format
1719

1820
ifeq (llvm,$(TOOLCHAIN))
1921
CFLAGS += $(GCC_C_INCLUDES)

pkg/relic/patches/0001-use-modul-random-for-seeding.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 14b985c86fd0f97b186adc445c224794c3c1b97b Mon Sep 17 00:00:00 2001
1+
From 736bfaae854159d944772f24b2ab9b2622808470 Mon Sep 17 00:00:00 2001
22
From: maksim-ka <42pema1bif@hft-stuttgart.de>
33
Date: Fri, 31 Jan 2020 15:15:46 +0100
4-
Subject: [PATCH 1/2] use modul random for seeding
4+
Subject: [PATCH 1/3] use modul random for seeding
55

66
---
77
src/rand/relic_rand_core.c | 5 +++++
88
1 file changed, 5 insertions(+)
99

1010
diff --git a/src/rand/relic_rand_core.c b/src/rand/relic_rand_core.c
11-
index 10f8929f..804b4455 100644
11+
index c21c5a9..09cd948 100644
1212
--- a/src/rand/relic_rand_core.c
1313
+++ b/src/rand/relic_rand_core.c
1414
@@ -171,6 +171,11 @@ void rand_init(void) {
@@ -24,5 +24,5 @@ index 10f8929f..804b4455 100644
2424

2525
#endif /* RAND == UDEV */
2626
--
27-
2.33.1
27+
2.39.5
2828

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
From ce1cd836aafefa92c3138f3e923147a42e95c886 Mon Sep 17 00:00:00 2001
1+
From e2f067469fb02535f8cf773a3b9de1c2cd8543af Mon Sep 17 00:00:00 2001
22
From: Kaspar Schleiser <kaspar@schleiser.de>
33
Date: Mon, 8 Nov 2021 22:37:38 +0100
4-
Subject: [PATCH 2/2] add RIOT random support to cmake and relic_conf.h
4+
Subject: [PATCH 2/3] add RIOT random support to cmake and relic_conf.h
55

66
---
77
cmake/rand.cmake | 1 +
88
include/relic_conf.h.in | 2 ++
99
2 files changed, 3 insertions(+)
1010

1111
diff --git a/cmake/rand.cmake b/cmake/rand.cmake
12-
index ed90c769..9f79fd6d 100644
12+
index ed90c76..9f79fd6 100644
1313
--- a/cmake/rand.cmake
1414
+++ b/cmake/rand.cmake
1515
@@ -12,6 +12,7 @@ message(" SEED=LIBC Use rand()/random() functions. (insecure!)")
@@ -21,10 +21,10 @@ index ed90c769..9f79fd6d 100644
2121
# Choose the pseudo-random number generator.
2222
set(RAND "HASHD" CACHE STRING "Pseudo-random number generator")
2323
diff --git a/include/relic_conf.h.in b/include/relic_conf.h.in
24-
index 1245edc0..4e807621 100644
24+
index f9bb79a..33db9d7 100644
2525
--- a/include/relic_conf.h.in
2626
+++ b/include/relic_conf.h.in
27-
@@ -656,6 +656,8 @@
27+
@@ -669,6 +669,8 @@
2828
#define UDEV 3
2929
/** Use Windows' CryptGenRandom. */
3030
#define WCGR 4
@@ -34,5 +34,5 @@ index 1245edc0..4e807621 100644
3434
#cmakedefine SEED @SEED@
3535

3636
--
37-
2.33.1
37+
2.39.5
3838

pkg/relic/patches/0003-fix-Wformat-nonliteral-by-using-printf-directly.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
From be6a8c76f021a2cba3d371c16bfb84a8264f51fe Mon Sep 17 00:00:00 2001
1+
From 49e5e3576572ebcaefab7fe996c89789c5476073 Mon Sep 17 00:00:00 2001
22
From: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
3-
Date: Sat, 20 May 2023 21:41:32 +0200
4-
Subject: [PATCH] fix -Wformat-nonliteral by using printf() directly
3+
Date: Mon, 13 Jan 2025 14:13:25 +0100
4+
Subject: [PATCH 3/3] fix -Wformat-nonliteral by using printf() directly
55

66
---
77
include/relic_util.h | 2 +-
88
src/relic_util.c | 36 ------------------------------------
99
2 files changed, 1 insertion(+), 37 deletions(-)
1010

1111
diff --git a/include/relic_util.h b/include/relic_util.h
12-
index 0dd1744..74e3216 100644
12+
index cdca0dc..379aa25 100644
1313
--- a/include/relic_util.h
1414
+++ b/include/relic_util.h
15-
@@ -296,7 +296,7 @@ int util_cmp_const(const void *a, const void *b, int n);
15+
@@ -316,7 +316,7 @@ void util_perm(uint_t p[], size_t n);
1616
* @param[in] format - the format.
1717
* @param[in] ... - the list of arguments matching the format.
1818
*/
@@ -22,11 +22,11 @@ index 0dd1744..74e3216 100644
2222
/**
2323
* Prints a digit.
2424
diff --git a/src/relic_util.c b/src/relic_util.c
25-
index 3bb369d..133153d 100644
25+
index c69fb5c..8207a41 100644
2626
--- a/src/relic_util.c
2727
+++ b/src/relic_util.c
28-
@@ -151,42 +151,6 @@ int util_cmp_const(const void *a, const void *b, int size) {
29-
return (result == 0 ? RLC_EQ : RLC_NE);
28+
@@ -162,42 +162,6 @@ void util_perm(uint_t p[], size_t n) {
29+
}
3030
}
3131

3232
-#ifndef QUIET
@@ -69,5 +69,5 @@ index 3bb369d..133153d 100644
6969
#if RLC_DIG == 64
7070
if (pad) {
7171
--
72-
2.40.1
72+
2.39.5
7373

tests/pkg/relic/Makefile.ci

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
BOARD_INSUFFICIENT_MEMORY := \
2+
airfy-beacon \
3+
atmega1284p \
24
atmega8 \
35
bluepill-stm32f030c8 \
6+
calliope-mini \
47
i-nucleo-lrwan1 \
8+
im880b \
9+
microbit \
10+
nrf51dongle \
11+
nrf6310 \
512
nucleo-c031c6 \
613
nucleo-f030r8 \
714
nucleo-f031k6 \
815
nucleo-f042k6 \
16+
nucleo-f070rb \
17+
nucleo-f072rb \
918
nucleo-f303k8 \
1019
nucleo-f334r8 \
1120
nucleo-l011k4 \
@@ -14,10 +23,14 @@ BOARD_INSUFFICIENT_MEMORY := \
1423
olimex-msp430-h1611 \
1524
olimex-msp430-h2618 \
1625
samd10-xmini \
26+
saml10-xpro \
27+
saml11-xpro \
1728
slstk3400a \
1829
stk3200 \
1930
stm32f030f4-demo \
2031
stm32g0316-disco \
2132
stm32l0538-disco \
2233
weact-g030f6 \
34+
yunjia-nrf51822 \
35+
zigduino \
2336
#

tests/pkg/relic/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static void tests_relic_ecdh(void)
114114
#endif
115115

116116
/* The secrets should be the same now */
117-
TEST_ASSERT_EQUAL_INT(RLC_EQ, util_cmp_const(sharedKeyA, sharedKeyB, RLC_MD_LEN));
117+
TEST_ASSERT_EQUAL_INT(RLC_EQ, util_cmp_sec(sharedKeyA, sharedKeyB, RLC_MD_LEN));
118118

119119
bn_free(privateA);
120120
ec_free(publicA);

0 commit comments

Comments
 (0)