diff options
-rw-r--r-- | patches/crda-3.18/0001-key2pub-Fix-ssl-keys.c-generation.patch (renamed from patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch) | 0 | ||||
-rw-r--r-- | patches/crda-3.18/0002-Pregenerate-keys-ssl.c.patch (renamed from patches/crda-3.13/0002-Pregenerate-keys-ssl.c.patch) | 70 | ||||
-rw-r--r-- | patches/crda-3.18/0003-udev-Fix-rule-for-initial-setup.patch (renamed from patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch) | 0 | ||||
-rw-r--r-- | patches/crda-3.18/0004-Makefile-Fix-libreg-build.patch (renamed from patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch) | 14 | ||||
-rw-r--r-- | patches/crda-3.18/0005-fix-linking-libreg.patch (renamed from patches/crda-3.13/0005-fix-linking-libreg.patch) | 26 | ||||
-rw-r--r-- | patches/crda-3.18/series (renamed from patches/crda-3.13/series) | 0 | ||||
-rw-r--r-- | rules/crda.make | 4 |
7 files changed, 83 insertions, 31 deletions
diff --git a/patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch b/patches/crda-3.18/0001-key2pub-Fix-ssl-keys.c-generation.patch index e3fe28c75..e3fe28c75 100644 --- a/patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch +++ b/patches/crda-3.18/0001-key2pub-Fix-ssl-keys.c-generation.patch diff --git a/patches/crda-3.13/0002-Pregenerate-keys-ssl.c.patch b/patches/crda-3.18/0002-Pregenerate-keys-ssl.c.patch index 4d1a95854..eba0f335e 100644 --- a/patches/crda-3.13/0002-Pregenerate-keys-ssl.c.patch +++ b/patches/crda-3.18/0002-Pregenerate-keys-ssl.c.patch @@ -8,18 +8,18 @@ versions. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - keys-ssl.c.32 | 42 ++++++++++++++++++++++++++++++++++++++++++ - keys-ssl.c.64 | 42 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 84 insertions(+) + keys-ssl.c.32 | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + keys-ssl.c.64 | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 140 insertions(+) create mode 100644 keys-ssl.c.32 create mode 100644 keys-ssl.c.64 diff --git a/keys-ssl.c.32 b/keys-ssl.c.32 new file mode 100644 -index 000000000000..593b06da7520 +index 000000000000..024afeb20577 --- /dev/null +++ b/keys-ssl.c.32 -@@ -0,0 +1,42 @@ +@@ -0,0 +1,70 @@ +#include <stdint.h> +#include <openssl/bn.h> +static BN_ULONG e_0[1] = { @@ -47,6 +47,33 @@ index 000000000000..593b06da7520 + 0x376024f2, 0x2a2ead68, 0x88d35dce, 0xd6579971, +}; + ++#include <stdint.h> ++#include <openssl/bn.h> ++static BN_ULONG e_1[1] = { ++ 0x00010001, ++}; ++ ++#include <stdint.h> ++#include <openssl/bn.h> ++static BN_ULONG n_1[64] = { ++ 0xc4ff951d, 0xa066f4da, 0xd5e1c45f, 0xe6e0d246, ++ 0x84e3c7a1, 0xe7fb4616, 0xf6e26899, 0x11151b7a, ++ 0xc5ee7852, 0x6c3f93fb, 0xd0d8dec8, 0x96790b2b, ++ 0xa129207c, 0xb1722bf4, 0x044137b1, 0x3673e797, ++ 0x2912661e, 0x18327707, 0x9a5ed820, 0xd37e005c, ++ 0x7568a1ea, 0x655b7f25, 0xa29c63c6, 0xe731f136, ++ 0xeeecac1e, 0x3036d253, 0xa5cb80c7, 0x85ef7a7f, ++ 0x45ebba27, 0x2ad91b73, 0xccd3df7d, 0x715756f6, ++ 0x36fa6823, 0x28900fac, 0x469b935f, 0xf1026fe9, ++ 0x21f0531f, 0x98b8d156, 0xb22dea88, 0x180b2895, ++ 0xa9fd602d, 0x8ad9fe76, 0x19da1044, 0x510cd145, ++ 0x1184fbca, 0x0b09f968, 0x1cfd24d5, 0x578b9616, ++ 0x146b61c4, 0x3b1b0817, 0x323d718b, 0x205bd497, ++ 0x1eb31270, 0x2d7e66f4, 0x52c2032a, 0x389f7c6a, ++ 0x3fd9d759, 0x7c68dd6f, 0x71257e90, 0xac7ea583, ++ 0x2c413815, 0xf239d766, 0x28843903, 0xb540e39c, ++}; ++ + +struct pubkey { + struct bignum_st e, n; @@ -61,13 +88,14 @@ index 000000000000..593b06da7520 + +__attribute__((unused)) static struct pubkey keys[] = { + KEYS(e_0, n_0), ++ KEYS(e_1, n_1), +}; diff --git a/keys-ssl.c.64 b/keys-ssl.c.64 new file mode 100644 -index 000000000000..ca0fc2978910 +index 000000000000..15110e56058d --- /dev/null +++ b/keys-ssl.c.64 -@@ -0,0 +1,42 @@ +@@ -0,0 +1,70 @@ +#include <stdint.h> +#include <openssl/bn.h> +static BN_ULONG e_0[1] = { @@ -95,6 +123,33 @@ index 000000000000..ca0fc2978910 + 0x2a2ead68376024f2, 0xd657997188d35dce, +}; + ++#include <stdint.h> ++#include <openssl/bn.h> ++static BN_ULONG e_1[1] = { ++ 0x0000000000010001, ++}; ++ ++#include <stdint.h> ++#include <openssl/bn.h> ++static BN_ULONG n_1[32] = { ++ 0xa066f4dac4ff951d, 0xe6e0d246d5e1c45f, ++ 0xe7fb461684e3c7a1, 0x11151b7af6e26899, ++ 0x6c3f93fbc5ee7852, 0x96790b2bd0d8dec8, ++ 0xb1722bf4a129207c, 0x3673e797044137b1, ++ 0x183277072912661e, 0xd37e005c9a5ed820, ++ 0x655b7f257568a1ea, 0xe731f136a29c63c6, ++ 0x3036d253eeecac1e, 0x85ef7a7fa5cb80c7, ++ 0x2ad91b7345ebba27, 0x715756f6ccd3df7d, ++ 0x28900fac36fa6823, 0xf1026fe9469b935f, ++ 0x98b8d15621f0531f, 0x180b2895b22dea88, ++ 0x8ad9fe76a9fd602d, 0x510cd14519da1044, ++ 0x0b09f9681184fbca, 0x578b96161cfd24d5, ++ 0x3b1b0817146b61c4, 0x205bd497323d718b, ++ 0x2d7e66f41eb31270, 0x389f7c6a52c2032a, ++ 0x7c68dd6f3fd9d759, 0xac7ea58371257e90, ++ 0xf239d7662c413815, 0xb540e39c28843903, ++}; ++ + +struct pubkey { + struct bignum_st e, n; @@ -109,4 +164,5 @@ index 000000000000..ca0fc2978910 + +__attribute__((unused)) static struct pubkey keys[] = { + KEYS(e_0, n_0), ++ KEYS(e_1, n_1), +}; diff --git a/patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch b/patches/crda-3.18/0003-udev-Fix-rule-for-initial-setup.patch index 551b84bf6..551b84bf6 100644 --- a/patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch +++ b/patches/crda-3.18/0003-udev-Fix-rule-for-initial-setup.patch diff --git a/patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch b/patches/crda-3.18/0004-Makefile-Fix-libreg-build.patch index ef02358d6..bb0708365 100644 --- a/patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch +++ b/patches/crda-3.18/0004-Makefile-Fix-libreg-build.patch @@ -8,10 +8,10 @@ Signed-off-by: Markus Pargmann <mpa@pengutronix.de> 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile -index 4a351c645bf4..b07d8ad8b690 100644 +index a3ead30371c9..60a3182474e6 100644 --- a/Makefile +++ b/Makefile -@@ -5,8 +5,8 @@ REG_GIT?=git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.g +@@ -5,8 +5,8 @@ REG_GIT?=git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.g PREFIX ?= /usr/ MANDIR ?= $(PREFIX)/share/man/ @@ -22,19 +22,19 @@ index 4a351c645bf4..b07d8ad8b690 100644 SBINDIR ?= /sbin/ -@@ -119,14 +119,14 @@ $(LIBREG): regdb.h reglib.h reglib.c +@@ -120,14 +120,14 @@ $(LIBREG): regdb.h reglib.h reglib.c install-libreg-headers: $(NQ) ' INSTALL libreg-headers' -- $(Q)mkdir -p $(INCLUDE_DIR) -- $(Q)cp *.h $(INCLUDE_DIR)/ +- $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR) +- $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/ + $(Q)$(MKDIR) $(DESTDIR)/$(INCLUDE_DIR) + $(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(INCLUDE_DIR) *.h install-libreg: $(NQ) ' INSTALL libreg' -- $(Q)mkdir -p $(LIBDIR) -- $(Q)cp $(LIBREG) $(LIBDIR)/ +- $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) +- $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ - $(Q)ldconfig + $(Q)$(MKDIR) $(LIBDIR) + $(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(LIBDIR) $(LIBREG) diff --git a/patches/crda-3.13/0005-fix-linking-libreg.patch b/patches/crda-3.18/0005-fix-linking-libreg.patch index fdb78ceaa..c98c35f6b 100644 --- a/patches/crda-3.13/0005-fix-linking-libreg.patch +++ b/patches/crda-3.18/0005-fix-linking-libreg.patch @@ -1,31 +1,27 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Thu, 8 May 2014 12:15:11 +0200 +Date: Thu, 30 Jun 2016 12:20:16 +0200 Subject: [PATCH] fix linking libreg Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- - Makefile | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index b07d8ad8b690..2d6747cd6cde 100644 +index 60a3182474e6..0bfded68a6c8 100644 --- a/Makefile +++ b/Makefile -@@ -28,10 +28,11 @@ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys - CFLAGS += -O2 -fpic - CFLAGS += -std=gnu99 -Wall -Werror -pedantic +@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic CFLAGS += -Wall -g + LDLIBREG += -lreg + LDLIBS += $(LDLIBREG) -LDLIBS += -lm +LIBREGLIBS += -lm - LDLIBREG += -lreg LIBREG += libreg.so --LDFLAGS += -L ./ $(LDLIBREG) -+LDFLAGS += -L ./ -+LDLIBS += $(LDLIBREG) - - all: all_noverify verify + LDFLAGS += -L ./ -@@ -39,13 +40,13 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize +@@ -40,13 +40,13 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize ifeq ($(USE_OPENSSL),1) CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` @@ -41,7 +37,7 @@ index b07d8ad8b690..2d6747cd6cde 100644 $(LIBREG): keys-gcrypt.c -@@ -115,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) +@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) $(LIBREG): regdb.h reglib.h reglib.c $(NQ) ' CC ' $@ diff --git a/patches/crda-3.13/series b/patches/crda-3.18/series index b9a852d35..b9a852d35 100644 --- a/patches/crda-3.13/series +++ b/patches/crda-3.18/series diff --git a/rules/crda.make b/rules/crda.make index a42c78390..87ca41446 100644 --- a/rules/crda.make +++ b/rules/crda.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_CRDA) += crda # # Paths and names # -CRDA_VERSION := 3.13 -CRDA_MD5 := 66b1b0417c1ad19f0009a5c0c0c1aebc +CRDA_VERSION := 3.18 +CRDA_MD5 := 0431fef3067bf503dfb464069f06163a CRDA := crda-$(CRDA_VERSION) CRDA_SUFFIX := tar.xz CRDA_URL := $(call ptx/mirror, KERNEL, ../software/network/crda/$(CRDA).$(CRDA_SUFFIX)) |