Merge pull request #30 from wolfmcnally/master

Replace SLIP-39 with SSKR

Author: ChristopherA

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "deps/bc-shamir"]
 	path = deps/bc-shamir
 	url = https://github.com/blockchaincommons/bc-shamir.git
-[submodule "deps/bc-slip39"]
-	path = deps/bc-slip39
-	url = https://github.com/blockchaincommons/bc-slip39.git
 [submodule "deps/bc-bip39"]
 	path = deps/bc-bip39
 	url = https://github.com/blockchaincommons/bc-bip39.git
@@ -20,3 +17,6 @@
 [submodule "deps/bc-ur"]
 	path = deps/bc-ur
 	url = https://github.com/BlockchainCommons/bc-ur.git
+[submodule "deps/bc-sskr"]
+	path = deps/bc-sskr
+	url = https://github.com/BlockchainCommons/bc-sskr.git

MANUAL.md

@@ -52,4 +52,5 @@ distclean:
 	rm -f autoscan.log
 	rm -f configure.scan configure.status config.log
 	rm -f config.log config.status config.h
-	rm -rf libs
+	rm -rf deps/*
+	rm -rf sysroot

Makefile.in

@@ -46,23 +46,23 @@ $ seedtool --count 32 --in cards 6c9s8c7c9c4cah6c2sjs7d5c2s4c4dqs
 7df301924511326d7350be14c9e7176d98e945f9ad0ed034726ad4ee0de59c25
 ```
 
-### Generate a 16-byte seed and encode it using SLIP-39 as 3 shares, 2 of which are required for recovery
+### Generate a 16-byte seed and encode it using SSKR as 3 shares, 2 of which are required for recovery
 
 ```
-$ seedtool --out slip39 --group 2-of-3
-forward enlarge academic acid earth anxiety believe aluminum identify various forecast airline taste tactics oasis frost patrol chest texture mental
-forward enlarge academic agency dress episode penalty animal trip paid cover blessing spark smart coal fluff starting mortgage friendly rival
-forward enlarge academic always distance memory both rhythm enforce costume spider mouse script wrote that favorite auction literary organize gross
+$ seedtool --out sskr --group 2-of-3
+tuna acid epic gyro edge twin able acid able yoga nail wand keno paid ruin jazz keys acid time film pool skew flew luck ruby song owls soap obey
+tuna acid epic gyro edge twin able acid acid yell omit mild webs warm epic flew liar view fuel deli fund glow skew dull knob claw gray surf wand
+tuna acid epic gyro edge twin able acid also visa wave bulb hope drum quad duty need tied vast barn kick task gray tent crux owls easy jolt toil
 ```
 
 ### Recover the above seed using 2 of the 3 shares
 
 ```
-$ seedtool --in slip39
-forward enlarge academic acid earth anxiety believe aluminum identify various forecast airline taste tactics oasis frost patrol chest texture mental
-forward enlarge academic always distance memory both rhythm enforce costume spider mouse script wrote that favorite auction literary organize gross
+$ seedtool --in sskr
+tuna acid epic gyro edge twin able acid able yoga nail wand keno paid ruin jazz keys acid time film pool skew flew luck ruby song owls soap obey
+tuna acid epic gyro edge twin able acid also visa wave bulb hope drum quad duty need tied vast barn kick task gray tent crux owls easy jolt toil
 ^D
-d17043174fc3a461ecb7d97c167c8ba1
+8a7e9c3c0d783371d80e1192e5f6217d
 ```
 
 ### Generate a seed, encode it as UR, transform it to upper case, display it on the console, and encode it to a QR Code in the file "seedqrcode.png"
@@ -125,7 +125,7 @@ See [`MANUAL.md`](MANUAL.md) for details, many more examples, and version histor
 
 * [`bc-crypto-base`](https://github.com/blockchaincommons/bc-crypto-base)
 * [`bc-shamir`](https://github.com/blockchaincommons/bc-shamir)
-* [`bc-slip39`](https://github.com/blockchaincommons/bc-slip39)
+* [`bc-sskr`](https://github.com/blockchaincommons/bc-sskr)
 * [`bc-bip39`](https://github.com/blockchaincommons/bc-bip39)
 * [`bc-ur`](https://github.com/blockchaincommons/bc-ur)
 * [`GNU argp`](https://www.gnu.org/software/libc/manual/html_node/Argp.html)
@@ -215,18 +215,6 @@ This table below also establishes provenance (repository of origin, permalink, a
 | randombytes.c | [dsprenkels/randombytes](https://github.com/dsprenkels/randombytes/blob/master/randombytes.c) | [6db39aa](https://github.com/dsprenkels/randombytes/commit/6db39aaae6bb9ab97beca00d81bcfe935c56c88d) | 2017-2019 [Daan Sprenkels](https://github.com/dsprenkels/) | [MIT](https://github.com/dsprenkels/randombytes/commit/73ae9b4fce2e62babdd6a480b53ad449dd745ed9) |
 | randombytes.h | [dsprenkels/randombytes](https://github.com/dsprenkels/randombytes/blob/master/randombytes.h) | [19fd002](https://github.com/dsprenkels/randombytes/commit/19fd002d9b7b001b333a671186a91231b60d821b) | 2017-2019 [Daan Sprenkels](https://github.com/dsprenkels/) | [MIT](https://github.com/dsprenkels/randombytes/commit/73ae9b4fce2e62babdd6a480b53ad449dd745ed9) |
 
-### Known Issues
-
-#### ⚠️ Warning: Lack of Round-trip Compatibility between BIP-39 and SLIP-39
-
-At first glance, BIP-39 and SLIP-39 both appear to be means of converting a binary seed to a set of backup words and back. You might assume you could simply convert a BIP-39 backup to a binary seed, from that binary seed to SLIP-39, and then use the SLIP-39 backup to recover the same wallet as the original BIP-39 backup, but this is **NOT** the case. This is because the SLIP-39 algorithm that SatoshiLabs uses in their Trezor wallet does not derive the master secret in the same way as their BIP-39 algorithm does.
-
-Currently Blockchain Commons is investigating an alternative to SLIP-39 that allows round-trips with BIP-39. We want to ensure that the same seed will result in the same derived keys using either BIP-39 or our alternative approach.
-
-As SLIP-39 is not round-trip compatible with BIP-39, and SLIP-39 is under the control of SatoshiLabs and does not appear to be a fully community-controlled standard, Blockchain Commons is no longer endorsing SLIP-39.
-
-* This issue is being tracked [here](https://github.com/BlockchainCommons/bc-lethekit/issues/38).
-
 ### Tool Dependencies
 
 To build `seedtool` you'll need to use the following tools:

README.md

@@ -22,7 +22,7 @@ make check
 make install
 popd
 
-pushd deps/bc-slip39
+pushd deps/bc-sskr
 ./configure --prefix ${SYSROOT}
 make check
 make install

build.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for bc-seedtool-cli 0.7.1.
+# Generated by GNU Autoconf 2.69 for bc-seedtool-cli 0.8.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='bc-seedtool-cli'
 PACKAGE_TARNAME='bc-seedtool-cli'
-PACKAGE_VERSION='0.7.1'
-PACKAGE_STRING='bc-seedtool-cli 0.7.1'
+PACKAGE_VERSION='0.8.0'
+PACKAGE_STRING='bc-seedtool-cli 0.8.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1232,7 +1232,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bc-seedtool-cli 0.7.1 to adapt to many kinds of systems.
+\`configure' configures bc-seedtool-cli 0.8.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1293,7 +1293,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bc-seedtool-cli 0.7.1:";;
+     short | recursive ) echo "Configuration of bc-seedtool-cli 0.8.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1375,7 +1375,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bc-seedtool-cli configure 0.7.1
+bc-seedtool-cli configure 0.8.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1962,7 +1962,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bc-seedtool-cli $as_me 0.7.1, which was
+It was created by bc-seedtool-cli $as_me 0.8.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3617,13 +3617,13 @@ else
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for slip39_word_for_string in -lbc-slip39" >&5
-$as_echo_n "checking for slip39_word_for_string in -lbc-slip39... " >&6; }
-if ${ac_cv_lib_bc_slip39_slip39_word_for_string+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sskr_generate in -lbc-sskr" >&5
+$as_echo_n "checking for sskr_generate in -lbc-sskr... " >&6; }
+if ${ac_cv_lib_bc_sskr_sskr_generate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbc-slip39  $LIBS"
+LIBS="-lbc-sskr  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3633,36 +3633,36 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char slip39_word_for_string ();
+char sskr_generate ();
 int
 main ()
 {
-return slip39_word_for_string ();
+return sskr_generate ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_bc_slip39_slip39_word_for_string=yes
+  ac_cv_lib_bc_sskr_sskr_generate=yes
 else
-  ac_cv_lib_bc_slip39_slip39_word_for_string=no
+  ac_cv_lib_bc_sskr_sskr_generate=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bc_slip39_slip39_word_for_string" >&5
-$as_echo "$ac_cv_lib_bc_slip39_slip39_word_for_string" >&6; }
-if test "x$ac_cv_lib_bc_slip39_slip39_word_for_string" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bc_sskr_sskr_generate" >&5
+$as_echo "$ac_cv_lib_bc_sskr_sskr_generate" >&6; }
+if test "x$ac_cv_lib_bc_sskr_sskr_generate" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBBC_SLIP39 1
+#define HAVE_LIBBC_SSKR 1
 _ACEOF
 
-  LIBS="-lbc-slip39 $LIBS"
+  LIBS="-lbc-sskr $LIBS"
 
 else
 
-  echo "### Error! libbc-slip39 must be installed first."
+  echo "### Error! libbc-sskr must be installed first."
   exit -1
 
 fi
@@ -3717,43 +3717,6 @@ else
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bytewords_encode in -lbc-bytewords" >&5
-$as_echo_n "checking for bytewords_encode in -lbc-bytewords... " >&6; }
-if ${ac_cv_lib_bc_bytewords_bytewords_encode+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbc-bytewords  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bytewords_encode ();
-int
-main ()
-{
-return bytewords_encode ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_bc_bytewords_bytewords_encode=yes
-else
-  ac_cv_lib_bc_bytewords_bytewords_encode=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bc_bytewords_bytewords_encode" >&5
-$as_echo "$ac_cv_lib_bc_bytewords_bytewords_encode" >&6; }
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for argp_parse in -largp" >&5
 $as_echo_n "checking for argp_parse in -largp... " >&6; }
 if ${ac_cv_lib_argp_argp_parse+:} false; then :
@@ -5035,7 +4998,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bc-seedtool-cli $as_me 0.7.1, which was
+This file was extended by bc-seedtool-cli $as_me 0.8.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5097,7 +5060,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-bc-seedtool-cli config.status 0.7.1
+bc-seedtool-cli config.status 0.8.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -5807,3 +5770,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
+

configure

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([bc-seedtool-cli], [0.7.1])
+AC_INIT([bc-seedtool-cli], [0.8.0])
 AC_CONFIG_SRCDIR([src/seedtool.cpp])
 AC_CONFIG_HEADERS([src/config.h])
 
@@ -21,8 +21,8 @@ AC_CHECK_LIB([bc-shamir], [split_secret], [], [
   echo "### Error! libbc-shamir must be installed first."
   exit -1
   ])
-AC_CHECK_LIB([bc-slip39], [slip39_word_for_string], [], [
-  echo "### Error! libbc-slip39 must be installed first."
+AC_CHECK_LIB([bc-sskr], [sskr_generate], [], [
+  echo "### Error! libbc-sskr must be installed first."
   exit -1
   ])
 AC_CHECK_LIB([bc-bip39], [bip39_mnemonic_from_word], [], [