Update buidlroot to version 2016.08.1
This commit is contained in:
-73
@@ -1,73 +0,0 @@
|
||||
From 479db2113643e459c11db392e0fefd6400657c9e Mon Sep 17 00:00:00 2001
|
||||
From: Constantin Rack <constantin@rack.li>
|
||||
Date: Sat, 8 Nov 2014 10:50:17 +0100
|
||||
Subject: [PATCH] Problem: return code of sodium_init() is not checked.
|
||||
|
||||
There are two todo comments in curve_client.cpp and curve_server.cpp that suggest
|
||||
checking the return code of sodium_init() call. sodium_init() returns -1 on error,
|
||||
0 on success and 1 if it has been called before and is already initalized:
|
||||
https://github.com/jedisct1/libsodium/blob/master/src/libsodium/sodium/core.c
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
Status: Upstream
|
||||
|
||||
diff --git a/src/curve_client.cpp b/src/curve_client.cpp
|
||||
index 6019c54..77fc420 100644
|
||||
--- a/src/curve_client.cpp
|
||||
+++ b/src/curve_client.cpp
|
||||
@@ -38,6 +38,7 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) :
|
||||
cn_peer_nonce(1),
|
||||
sync()
|
||||
{
|
||||
+ int rc;
|
||||
memcpy (public_key, options_.curve_public_key, crypto_box_PUBLICKEYBYTES);
|
||||
memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES);
|
||||
memcpy (server_key, options_.curve_server_key, crypto_box_PUBLICKEYBYTES);
|
||||
@@ -47,12 +48,12 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) :
|
||||
unsigned char tmpbytes[4];
|
||||
randombytes(tmpbytes, 4);
|
||||
#else
|
||||
- // todo check return code
|
||||
- sodium_init();
|
||||
+ rc = sodium_init ();
|
||||
+ zmq_assert (rc != -1);
|
||||
#endif
|
||||
|
||||
// Generate short-term key pair
|
||||
- const int rc = crypto_box_keypair (cn_public, cn_secret);
|
||||
+ rc = crypto_box_keypair (cn_public, cn_secret);
|
||||
zmq_assert (rc == 0);
|
||||
}
|
||||
|
||||
diff --git a/src/curve_server.cpp b/src/curve_server.cpp
|
||||
index a3c4243..22c32d6 100644
|
||||
--- a/src/curve_server.cpp
|
||||
+++ b/src/curve_server.cpp
|
||||
@@ -42,6 +42,7 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_,
|
||||
cn_peer_nonce(1),
|
||||
sync()
|
||||
{
|
||||
+ int rc;
|
||||
// Fetch our secret key from socket options
|
||||
memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES);
|
||||
scoped_lock_t lock (sync);
|
||||
@@ -50,12 +51,12 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_,
|
||||
unsigned char tmpbytes[4];
|
||||
randombytes(tmpbytes, 4);
|
||||
#else
|
||||
- // todo check return code
|
||||
- sodium_init();
|
||||
+ rc = sodium_init ();
|
||||
+ zmq_assert (rc != -1);
|
||||
#endif
|
||||
|
||||
// Generate short-term key pair
|
||||
- const int rc = crypto_box_keypair (cn_public, cn_secret);
|
||||
+ rc = crypto_box_keypair (cn_public, cn_secret);
|
||||
zmq_assert (rc == 0);
|
||||
}
|
||||
|
||||
--
|
||||
2.4.10
|
||||
|
||||
@@ -27,13 +27,25 @@ config BR2_PACKAGE_ZEROMQ
|
||||
|
||||
if BR2_PACKAGE_ZEROMQ
|
||||
|
||||
comment "norm support needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_ZEROMQ_NORM
|
||||
bool "NORM support"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
select BR2_PACKAGE_NORM
|
||||
help
|
||||
Add support for NACK-Oriented Reliable Multicast (RFC 5740)
|
||||
protocol.
|
||||
|
||||
config BR2_PACKAGE_ZEROMQ_PGM
|
||||
bool "PGM/EPGM support"
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX # openpgm
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_2
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
select BR2_PACKAGE_OPENPGM
|
||||
help
|
||||
Add support for Pragmatic General Multicast protocol (RFC 3208)
|
||||
implemented either over raw IP packets or UDP datagrams
|
||||
(encapsulated PGM). This requires OpenPGM library.
|
||||
(encapsulated PGM).
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From http://download.zeromq.org/SHA1SUMS:
|
||||
sha1 b7185724f2fd56d0face50047757ac2a04d26ca4 zeromq-4.1.3.tar.gz
|
||||
# From https://github.com/zeromq/zeromq4-1/releases
|
||||
sha1 2b7490b77860be3060b1b1f92cd73184d309ca69 zeromq-4.1.5.tar.gz
|
||||
# Calculated based on the hash above
|
||||
sha256 61b31c830db377777e417235a24d3660a4bcc3f40d303ee58df082fcd68bf411 zeromq-4.1.3.tar.gz
|
||||
sha256 04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf zeromq-4.1.5.tar.gz
|
||||
|
||||
@@ -4,10 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ZEROMQ_VERSION = 4.1.3
|
||||
ZEROMQ_SITE = http://download.zeromq.org
|
||||
ZEROMQ_VERSION = 4.1.5
|
||||
ZEROMQ_SITE = https://github.com/zeromq/zeromq4-1/releases/download/v$(ZEROMQ_VERSION)
|
||||
ZEROMQ_INSTALL_STAGING = YES
|
||||
ZEROMQ_DEPENDENCIES = util-linux
|
||||
ZEROMQ_CONF_OPTS = --without-documentation
|
||||
ZEROMQ_LICENSE = LGPLv3+ with exceptions
|
||||
ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER
|
||||
# For 0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch
|
||||
@@ -28,9 +29,18 @@ ifeq ($(BR2_STATIC_LIBS),y)
|
||||
ZEROMQ_CONF_OPTS += LIBS=-lstdc++
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZEROMQ_NORM),y)
|
||||
ZEROMQ_CONF_OPTS += --with-norm
|
||||
ZEROMQ_DEPENDENCIES += norm
|
||||
else
|
||||
ZEROMQ_CONF_OPTS += --without-norm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZEROMQ_PGM),y)
|
||||
ZEROMQ_DEPENDENCIES += host-pkgconf openpgm
|
||||
ZEROMQ_CONF_OPTS += --with-system-pgm
|
||||
ZEROMQ_CONF_OPTS += --with-pgm
|
||||
else
|
||||
ZEROMQ_CONF_OPTS += --without-pgm
|
||||
endif
|
||||
|
||||
# ZeroMQ uses libsodium if it's available.
|
||||
|
||||
Reference in New Issue
Block a user