fastd: fix build with newer libsodium

PATCH New Baruch Siach 3 participants 4 messages Dec 7, 2017 – Dec 8, 2017

lore

Share & tools

lore

Baruch Siach

author

2017-12-07 17:48 UTC #0 lore raw

PATCH 1/1 fastd: fix build with newer libsodium

Add upstream patch removing aes128-ctr support that libsodium no longer provides.

Fixes:
http://autobuild.buildroot.net/results/90c/90c526491a9eb6b5ceb38a0218fd480c03208217/
http://autobuild.buildroot.net/results/f81/f815dbfee7099f3b8fea7036e1fd10385f8c6a80/
http://autobuild.buildroot.net/results/329/3299d413ee98963e62c0df4087604c9872fcad68/

Cc Alexander Dahl <[email protected]>

Signed-off-by Baruch Siach <[email protected]>

---
 ...her-remove-aes128-ctr-NaCl-implementation.patch | 137 +++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 package/fastd/0001-cipher-remove-aes128-ctr-NaCl-implementation.patch

package/fastd/0001-cipher-remove-aes128-ctr-NaCl-implementation.patch new file +137 -0

new file mode 100644
index 000000000000..854b3e74cbf6
@@ -0,0 +1,137 @@
+From 4b8c4f54bbd70849fc91679bea44b4e1dfb0526d Mon Sep 17 00:00:00 2001
+From: Matthias Schiffer <[email protected]>
+Date: Wed, 18 Oct 2017 20:11:30 +0200
+Subject: [PATCH] cipher: remove aes128-ctr NaCl implementation
+
+New versions of libsodium have dropped support for aes128-ctr. AES support
+is only available with OpenSSL now.
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Patch status: upstream commit 4b8c4f54bb
+
+ doc/source/manual/config.rst                       |  1 -
+ src/crypto/cipher/aes128_ctr/CMakeLists.txt        |  1 -
+ src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt   |  6 --
+ .../aes128_ctr/nacl/cipher_aes128_ctr_nacl.c       | 76 ----------------------
+ 4 files changed, 84 deletions(-)
+ delete mode 100644 src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
+ delete mode 100644 src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c
+
+diff --git a/doc/source/manual/config.rst b/doc/source/manual/config.rst
+index 0abebeb4c245..94d7a9495ef0 100644
+--- a/doc/source/manual/config.rst
++++ b/doc/source/manual/config.rst
+@@ -70,7 +70,6 @@ Example config:
+   * ``aes128-ctr``: AES128 in counter mode
+ 
+     - ``openssl``: Use implementation from OpenSSL's libcrypto
+-    - ``nacl``: Use implementation from NaCl or libsodium
+ 
+   * ``null``: No encryption (for authenticated-only methods using composed_gmac)
+ 
+diff --git a/src/crypto/cipher/aes128_ctr/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/CMakeLists.txt
+index 0588fed798e2..58e8c6b3371c 100644
+--- a/src/crypto/cipher/aes128_ctr/CMakeLists.txt
++++ b/src/crypto/cipher/aes128_ctr/CMakeLists.txt
+@@ -1,3 +1,2 @@
+ fastd_cipher(aes128-ctr aes128_ctr.c)
+ add_subdirectory(openssl)
+-add_subdirectory(nacl)
+diff --git a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
+deleted file mode 100644
+index 676aa5d48ec4..000000000000
+--- a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
++++ /dev/null
+@@ -1,6 +0,0 @@
+-fastd_cipher_impl(aes128-ctr nacl
+-  cipher_aes128_ctr_nacl.c
+-)
+-fastd_cipher_impl_include_directories(aes128-ctr nacl ${NACL_INCLUDE_DIRS})
+-fastd_cipher_impl_link_libraries(aes128-ctr nacl ${NACL_LIBRARIES})
+-fastd_cipher_impl_require(aes128-ctr nacl NACL)
+diff --git a/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c b/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c
+deleted file mode 100644
+index ead632640414..000000000000
+--- a/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/*
+-  Copyright (c) 2012-2016, Matthias Schiffer <[email protected]>
+-  All rights reserved.
+-
+-  Redistribution and use in source and binary forms, with or without
+-  modification, are permitted provided that the following conditions are met:
+-
+-    1. Redistributions of source code must retain the above copyright notice,
+-       this list of conditions and the following disclaimer.
+-    2. Redistributions in binary form must reproduce the above copyright notice,
+-       this list of conditions and the following disclaimer in the documentation
+-       and/or other materials provided with the distribution.
+-
+-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-*/
+-
+-/**
+-   \file
+-
+-   The aes128-ctr implementation from NaCl
+-*/
+-
+-
+-#include "../../../../crypto.h"
+-#include "../../../../alloc.h"
+-
+-#include <crypto_stream_aes128ctr.h>
+-
+-
+-/** The cipher state */
+-struct __attribute__((aligned(16))) fastd_cipher_state {
+-	uint8_t d[crypto_stream_aes128ctr_BEFORENMBYTES] __attribute__((aligned(16))); /**< The unpacked AES key */
+-};
+-
+-
+-/** Initializes the cipher state */
+-static fastd_cipher_state_t * aes128_ctr_init(const uint8_t *key) {
+-	fastd_block128_t k;
+-	memcpy(k.b, key, sizeof(fastd_block128_t));
+-
+-	fastd_cipher_state_t *state = fastd_new_aligned(fastd_cipher_state_t, 16);
+-	crypto_stream_aes128ctr_beforenm(state->d, k.b);
+-
+-	return state;
+-}
+-
+-/** XORs data with the aes128-ctr cipher stream */
+-static bool aes128_ctr_crypt(const fastd_cipher_state_t *state, fastd_block128_t *out, const fastd_block128_t *in, size_t len, const uint8_t *iv) {
+-	crypto_stream_aes128ctr_xor_afternm(out->b, in->b, len, iv, state->d);
+-	return true;
+-}
+-
+-/** Frees the cipher state */
+-static void aes128_ctr_free(fastd_cipher_state_t *state) {
+-	if (state) {
+-		secure_memzero(state, sizeof(*state));
+-		free(state);
+-	}
+-}
+-
+-
+-/** The nacl aes128-ctr implementation */
+-const fastd_cipher_t fastd_cipher_aes128_ctr_nacl = {
+-	.init = aes128_ctr_init,
+-	.crypt = aes128_ctr_crypt,
+-	.free = aes128_ctr_free,
+-};
+-- 
+2.15.0
+

Signature · 1 line

2.15.0

Alexander Dahl

2017-12-07 21:20 UTC #1 lore raw

PATCH 1/1 fastd: fix build with newer libsodium

Hei hei,

thanks for that. I had a short look into that today in the morning, but did not find the time yet to import and test the patch.

I hope I find some time to test the program in the next days.

Greets
Alex

Quoted 160 lines · Baruch Siach

Add upstream patch removing aes128-ctr support that libsodium no longer provides.

Cc Alexander Dahl <[email protected]>

Signed-off-by Baruch Siach <[email protected]>

---
 ...her-remove-aes128-ctr-NaCl-implementation.patch | 137 +++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 package/fastd/0001-cipher-remove-aes128-ctr-NaCl-implementation.patch

package/fastd/0001-cipher-remove-aes128-ctr-NaCl-implementation.patch new file +137 -0

new file mode 100644
index 000000000000..854b3e74cbf6
@@ -0,0 +1,137 @@
+From 4b8c4f54bbd70849fc91679bea44b4e1dfb0526d Mon Sep 17 00:00:00 2001
+From: Matthias Schiffer <[email protected]>
+Date: Wed, 18 Oct 2017 20:11:30 +0200
+Subject: [PATCH] cipher: remove aes128-ctr NaCl implementation
+
+New versions of libsodium have dropped support for aes128-ctr. AES support
+is only available with OpenSSL now.
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Patch status: upstream commit 4b8c4f54bb
+
+ doc/source/manual/config.rst                       |  1 -
+ src/crypto/cipher/aes128_ctr/CMakeLists.txt        |  1 -
+ src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt   |  6 --
+ .../aes128_ctr/nacl/cipher_aes128_ctr_nacl.c       | 76 ----------------------
+ 4 files changed, 84 deletions(-)
+ delete mode 100644 src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
+ delete mode 100644 src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c
+
+diff --git a/doc/source/manual/config.rst b/doc/source/manual/config.rst
+index 0abebeb4c245..94d7a9495ef0 100644
+--- a/doc/source/manual/config.rst
++++ b/doc/source/manual/config.rst
+@@ -70,7 +70,6 @@ Example config:
+   * ``aes128-ctr``: AES128 in counter mode
+ 
+     - ``openssl``: Use implementation from OpenSSL's libcrypto
+-    - ``nacl``: Use implementation from NaCl or libsodium
+ 
+   * ``null``: No encryption (for authenticated-only methods using composed_gmac)
+ 
+diff --git a/src/crypto/cipher/aes128_ctr/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/CMakeLists.txt
+index 0588fed798e2..58e8c6b3371c 100644
+--- a/src/crypto/cipher/aes128_ctr/CMakeLists.txt
++++ b/src/crypto/cipher/aes128_ctr/CMakeLists.txt
+@@ -1,3 +1,2 @@
+ fastd_cipher(aes128-ctr aes128_ctr.c)
+ add_subdirectory(openssl)
+-add_subdirectory(nacl)
+diff --git a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
+deleted file mode 100644
+index 676aa5d48ec4..000000000000
+--- a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
++++ /dev/null
+@@ -1,6 +0,0 @@
+-fastd_cipher_impl(aes128-ctr nacl
+-  cipher_aes128_ctr_nacl.c
+-)
+-fastd_cipher_impl_include_directories(aes128-ctr nacl ${NACL_INCLUDE_DIRS})
+-fastd_cipher_impl_link_libraries(aes128-ctr nacl ${NACL_LIBRARIES})
+-fastd_cipher_impl_require(aes128-ctr nacl NACL)
+diff --git a/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c b/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c
+deleted file mode 100644
+index ead632640414..000000000000
+--- a/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/*
+-  Copyright (c) 2012-2016, Matthias Schiffer <[email protected]>
+-  All rights reserved.
+-
+-  Redistribution and use in source and binary forms, with or without
+-  modification, are permitted provided that the following conditions are met:
+-
+-    1. Redistributions of source code must retain the above copyright notice,
+-       this list of conditions and the following disclaimer.
+-    2. Redistributions in binary form must reproduce the above copyright notice,
+-       this list of conditions and the following disclaimer in the documentation
+-       and/or other materials provided with the distribution.
+-
+-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-*/
+-
+-/**
+-   \file
+-
+-   The aes128-ctr implementation from NaCl
+-*/
+-
+-
+-#include "../../../../crypto.h"
+-#include "../../../../alloc.h"
+-
+-#include <crypto_stream_aes128ctr.h>
+-
+-
+-/** The cipher state */
+-struct __attribute__((aligned(16))) fastd_cipher_state {
+-	uint8_t d[crypto_stream_aes128ctr_BEFORENMBYTES] __attribute__((aligned(16))); /**< The unpacked AES key */
+-};
+-
+-
+-/** Initializes the cipher state */
+-static fastd_cipher_state_t * aes128_ctr_init(const uint8_t *key) {
+-	fastd_block128_t k;
+-	memcpy(k.b, key, sizeof(fastd_block128_t));
+-
+-	fastd_cipher_state_t *state = fastd_new_aligned(fastd_cipher_state_t, 16);
+-	crypto_stream_aes128ctr_beforenm(state->d, k.b);
+-
+-	return state;
+-}
+-
+-/** XORs data with the aes128-ctr cipher stream */
+-static bool aes128_ctr_crypt(const fastd_cipher_state_t *state, fastd_block128_t *out, const fastd_block128_t *in, size_t len, const uint8_t *iv) {
+-	crypto_stream_aes128ctr_xor_afternm(out->b, in->b, len, iv, state->d);
+-	return true;
+-}
+-
+-/** Frees the cipher state */
+-static void aes128_ctr_free(fastd_cipher_state_t *state) {
+-	if (state) {
+-		secure_memzero(state, sizeof(*state));
+-		free(state);
+-	}
+-}
+-
+-
+-/** The nacl aes128-ctr implementation */
+-const fastd_cipher_t fastd_cipher_aes128_ctr_nacl = {
+-	.init = aes128_ctr_init,
+-	.crypt = aes128_ctr_crypt,
+-	.free = aes128_ctr_free,
+-};
+-- 
+2.15.0
+

Signature · 1 line

2.15.0

Signature · 11 lines

?With the first link, the chain is forged. The first speech censured, 
the first thought forbidden, the first freedom denied, chains us all 
irrevocably.? (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: C28E E6B9 0263 95CF 8FAF  08FA 34AD CD00 7221 5CC6 ***
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20171207/87039880/attachment.asc>

Alexander Dahl

2017-12-08 07:06 UTC #2 lore raw

PATCH 1/1 fastd: fix build with newer libsodium

In reply to Baruch Siach

Hei hei,

Quoted 2 lines · Baruch Siach

Add upstream patch removing aes128-ctr support that libsodium no longer provides.

You didn't notice there are already two patches for fastd, now there are:

* 0001-cipher-remove-aes128-ctr-NaCl-implementation.patch
* 0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch
* 0002-CMakeList-do-not-overwrite-module-path.patch

The new patch should be 0003.

Greets
Alex

Signature · 11 lines

?With the first link, the chain is forged. The first speech censured, 
the first thought forbidden, the first freedom denied, chains us all 
irrevocably.? (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: C28E E6B9 0263 95CF 8FAF  08FA 34AD CD00 7221 5CC6 ***
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20171208/ca54b8d8/attachment.asc>

Thomas Petazzoni

Applied

2017-12-08 16:45 UTC #3 lore raw

PATCH 1/1 fastd: fix build with newer libsodium

In reply to Baruch Siach

Hello,

Quoted 8 lines · Baruch Siach

Add upstream patch removing aes128-ctr support that libsodium no longer provides.
Fixes:
http://autobuild.buildroot.net/results/90c/90c526491a9eb6b5ceb38a0218fd480c03208217/
http://autobuild.buildroot.net/results/f81/f815dbfee7099f3b8fea7036e1fd10385f8c6a80/
http://autobuild.buildroot.net/results/329/3299d413ee98963e62c0df4087604c9872fcad68/

Quoted 6 lines

Cc Alexander Dahl <[email protected]>

Signed-off-by Baruch Siach <[email protected]>

---
 ...her-remove-aes128-ctr-NaCl-implementation.patch | 137 +++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 package/fastd/0001-cipher-remove-aes128-ctr-NaCl-implementation.patch

Applied to master, after fixing the patch numbering, as noticed by Alexander Dahl. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com