Skip to content

Commit 7225304

Browse files
authored
Merge pull request #31 from wolfmcnally/master
Updated to latest version of dependencies.
2 parents dca9cf0 + e91aba7 commit 7225304

File tree

10 files changed

+24
-19
lines changed

10 files changed

+24
-19
lines changed

MANUAL.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,10 @@ e3b0c44298fc1c149afbf4c8996fb924
914914

915915
## Version History
916916

917+
### 0.8.1, 9/19/2020
918+
919+
* Updated to latest versions of dependencies.
920+
917921
### 0.8.0, 9/15/2020
918922

919923
* Replaced SLIP-39 with SSKR.

configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for bc-seedtool-cli 0.8.0.
3+
# Generated by GNU Autoconf 2.69 for bc-seedtool-cli 0.8.1.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
577577
# Identity of this package.
578578
PACKAGE_NAME='bc-seedtool-cli'
579579
PACKAGE_TARNAME='bc-seedtool-cli'
580-
PACKAGE_VERSION='0.8.0'
581-
PACKAGE_STRING='bc-seedtool-cli 0.8.0'
580+
PACKAGE_VERSION='0.8.1'
581+
PACKAGE_STRING='bc-seedtool-cli 0.8.1'
582582
PACKAGE_BUGREPORT=''
583583
PACKAGE_URL=''
584584

@@ -1232,7 +1232,7 @@ if test "$ac_init_help" = "long"; then
12321232
# Omit some internal or obsolete options to make the list less imposing.
12331233
# This message is too long to be a string in the A/UX 3.1 sh.
12341234
cat <<_ACEOF
1235-
\`configure' configures bc-seedtool-cli 0.8.0 to adapt to many kinds of systems.
1235+
\`configure' configures bc-seedtool-cli 0.8.1 to adapt to many kinds of systems.
12361236
12371237
Usage: $0 [OPTION]... [VAR=VALUE]...
12381238
@@ -1293,7 +1293,7 @@ fi
12931293

12941294
if test -n "$ac_init_help"; then
12951295
case $ac_init_help in
1296-
short | recursive ) echo "Configuration of bc-seedtool-cli 0.8.0:";;
1296+
short | recursive ) echo "Configuration of bc-seedtool-cli 0.8.1:";;
12971297
esac
12981298
cat <<\_ACEOF
12991299
@@ -1375,7 +1375,7 @@ fi
13751375
test -n "$ac_init_help" && exit $ac_status
13761376
if $ac_init_version; then
13771377
cat <<\_ACEOF
1378-
bc-seedtool-cli configure 0.8.0
1378+
bc-seedtool-cli configure 0.8.1
13791379
generated by GNU Autoconf 2.69
13801380
13811381
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1962,7 +1962,7 @@ cat >config.log <<_ACEOF
19621962
This file contains any messages produced by compilers while
19631963
running configure, to aid debugging if configure makes a mistake.
19641964
1965-
It was created by bc-seedtool-cli $as_me 0.8.0, which was
1965+
It was created by bc-seedtool-cli $as_me 0.8.1, which was
19661966
generated by GNU Autoconf 2.69. Invocation command line was
19671967
19681968
$ $0 $@
@@ -4998,7 +4998,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
49984998
# report actual input values of CONFIG_FILES etc. instead of their
49994999
# values after options handling.
50005000
ac_log="
5001-
This file was extended by bc-seedtool-cli $as_me 0.8.0, which was
5001+
This file was extended by bc-seedtool-cli $as_me 0.8.1, which was
50025002
generated by GNU Autoconf 2.69. Invocation command line was
50035003
50045004
CONFIG_FILES = $CONFIG_FILES
@@ -5060,7 +5060,7 @@ _ACEOF
50605060
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
50615061
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
50625062
ac_cs_version="\\
5063-
bc-seedtool-cli config.status 0.8.0
5063+
bc-seedtool-cli config.status 0.8.1
50645064
configured by $0, generated by GNU Autoconf 2.69,
50655065
with options \\"\$ac_cs_config\\"
50665066

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.69])
5-
AC_INIT([bc-seedtool-cli], [0.8.0])
5+
AC_INIT([bc-seedtool-cli], [0.8.1])
66
AC_CONFIG_SRCDIR([src/seedtool.cpp])
77
AC_CONFIG_HEADERS([src/config.h])
88

src/format-random.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
void FormatRandom::process_input(Params* p) {
1212
p->seed.resize(p->count);
13-
p->rng(p->seed.data(), p->count);
13+
p->rng(p->seed.data(), p->count, NULL);
1414
}
1515

1616
void FormatRandom::process_output(Params* p) {

src/format-sskr.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ void FormatSSKR::process_output(Params* p) {
109109
groups_threshold, groups.data(), groups.size(),
110110
p->seed.data(), seed_len,
111111
&bytes_in_each_share, shares_buffer, shares_buffer_len,
112+
NULL,
112113
p->rng
113114
);
114115

src/random.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using namespace std;
1919

20-
void crypto_random(uint8_t* buf, size_t n) {
20+
void crypto_random(uint8_t* buf, size_t n, void* ctx) {
2121
assert(randombytes(buf, n) == 0);
2222
}
2323

@@ -30,7 +30,7 @@ void seed_deterministic_string(const string &string) {
3030
deterministic_salt = 0;
3131
}
3232

33-
void deterministic_random(uint8_t* buf, size_t n) {
33+
void deterministic_random(uint8_t* buf, size_t n, void* ctx) {
3434
deterministic_salt += 1;
3535

3636
hkdf_sha256(buf, n,

src/random.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
#include <vector>
1414
#include "utils.hpp"
1515

16-
typedef void (*random_generator)(uint8_t*, size_t);
16+
typedef void (*random_generator)(uint8_t*, size_t, void*);
1717

1818
// Generates a buffer of random bytes using the OS's cryptographically strong random number generator.
19-
void crypto_random(uint8_t* buf, size_t n);
19+
void crypto_random(uint8_t* buf, size_t n, void* ctx);
2020

2121
// Seeds the cryptographically strong deterministic random number generator with the SHA256 digest of the string.
2222
void seed_deterministic_string(const std::string &string);
2323

2424
// Generates a buffer of random bytes using the cryptographically strong deterministic random number generator.
25-
void deterministic_random(uint8_t* buf, size_t n);
25+
void deterministic_random(uint8_t* buf, size_t n, void* ctx);
2626

2727
ByteVector deterministic_random(const ByteVector &entropy, size_t n);
2828

0 commit comments

Comments
 (0)