update sharer class names

README.md

@@ -37,12 +37,20 @@ Tools for sharing secrets (like Bitcoin private keys), using shamir's secret sha
 
 ### Bitcoin Private Keys
 
-#### Splitting into reliably transcribable shares
+#### Splitting into reliably transcribable b32 shares
 
-    >>> from secretsharing import BitcoinSecretSharer
+    >>> from secretsharing import BitcoinToB32SecretSharer
     >>> secret = "5KJvsngHeMpm884wtkJNzQGaCErckhHJBGFsvd3VyK5qMZXj3hS"
-    >>> sharer = BitcoinSecretSharer()
-    >>> shares = sharer.split_secret(secret, 2, 3)
+    >>> b32_sharer = BitcoinToB32SecretSharer()
+    >>> shares = b32_sharer.split_secret(secret, 2, 3)
+    ['B-RJ6Y56OSUWDY5VAAGC6XLSTM64CAJ2LPBNB7NKATJCWC7VSHIP5DQIVMR6OGJ4GB', 'C-CT5R24XAR5B732JWYQKSYOYBSF5VHI73HLY24QCFRJR5XUW64C4JWYN6SRGWVCUG', 'D-T54KX27OPEAGZ7TNK5WOFK4WFPZKEXUHNKPWLWDXZQNYPT3WPV3P5IGQTD7HAJDG']
+
+#### Splitting into reliably transcribable zb32 shares
+
+    >>> from secretsharing import BitcoinToZB32SecretSharer
+    >>> secret = "5KJvsngHeMpm884wtkJNzQGaCErckhHJBGFsvd3VyK5qMZXj3hS"
+    >>> zb32_sharer = BitcoinToZB32SecretSharer()
+    >>> shares = zb32_sharer.split_secret(secret, 2, 3)
     ['b-aweuzkm9jmfgd7x4k595bzcm3er3epf4dprfwzpprqa3exbuocs9byn4owfuqbo', 'n-btetgqqu8doacarsbyfdzpyycyj6gfdeaaxrpfx33pdjk4ou1d5owjdmdi1iegm9', 'd-njh33f14q7smucmh8iq8uaewc8mzub3mzptrwsegfiz3hc1fozkkjtguc4trh6sq']
 
 #### Recovering from shares

secretsharing/__init__.py

@@ -7,7 +7,7 @@
     :license: MIT, see LICENSE for more details.
 """
 
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 from .sharing import *
 from .charset import *

secretsharing/sharing.py

@@ -121,7 +121,14 @@ class PlaintextToHexSecretSharer(SecretSharer):
     def __init__(self):
         SecretSharer.__init__(self, string.printable, string.hexdigits[0:16])
 
-class BitcoinSecretSharer(SecretSharer):
+class BitcoinToB32SecretSharer(SecretSharer):
+    """ Good for converting Bitcoin secret keys into shares that can be
+        reliably and conveniently transcribed.
+    """
+    def __init__(self):
+        SecretSharer.__init__(self, charset.base58_chars, charset.base32_chars)
+
+class BitcoinToZB32SecretSharer(SecretSharer):
     """ Good for converting Bitcoin secret keys into shares that can be
         reliably and conveniently transcribed.
     """

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='secretsharing',
-    version='0.2.0',
+    version='0.2.1',
     url='https://github.com/rxl/secretsharing',
     license='MIT',
     author='Halfmoon Labs',

tests/unit_tests.py

@@ -32,15 +32,27 @@ def test_hex_to_hex_sharing(self):
 		recovered_secret = self.split_and_recover_secret(secret, sharer, 3, 5)
 		assert(recovered_secret == secret)
 
-	def test_ascii_to_hex_sharing(self):
+	def test_printable_ascii_to_hex_sharing(self):
 		secret = "correct horse battery staple"
 		sharer = PlaintextToHexSecretSharer()
 		recovered_secret = self.split_and_recover_secret(secret, sharer, 3, 5)
 		assert(recovered_secret == secret)
 
 	def test_b58_to_zb32_sharing(self):
 		secret = "5KJvsngHeMpm884wtkJNzQGaCErckhHJBGFsvd3VyK5qMZXj3hS"
-		sharer = BitcoinSecretSharer()
+		sharer = BitcoinToZB32SecretSharer()
+		recovered_secret = self.split_and_recover_secret(secret, sharer, 3, 5)
+		assert(recovered_secret == secret)
+
+	def test_b58_to_b32_sharing(self):
+		secret = "5KJvsngHeMpm884wtkJNzQGaCErckhHJBGFsvd3VyK5qMZXj3hS"
+		sharer = BitcoinToB32SecretSharer()
+		recovered_secret = self.split_and_recover_secret(secret, sharer, 3, 5)
+		assert(recovered_secret == secret)
+
+	def test_hex_to_base64_sharing(self):
+		secret = "c4bbcb1fbec99d65bf59d85c8cb62ee2db963f0fe106f483d9afa73bd4e39a8a"
+		sharer = SecretSharer(secret_charset=base16_chars, share_charset=base64_chars)
 		recovered_secret = self.split_and_recover_secret(secret, sharer, 3, 5)
 		assert(recovered_secret == secret)