Add abbreviated_string() to sha* classes

2 files changed, 23 insertions, 10 deletions

diff --git a/tests/sha1/driver.cxx b/tests/sha1/driver.cxx
index 5f5bb69..a2683d1 100644
--- a/tests/sha1/driver.cxx
+++ b/tests/sha1/driver.cxx
@@ -33,13 +33,18 @@ main ()
   assert (string (sha1 ("").string ()) !=
           "da39a3ee5e6b4b0d3255bfef95601890afd80709");
 
-  assert (string (sha1 ("123").string ()) ==
-          "cc320164df1a2130045a28f08d3b88bc5bbcc43a");
-
   assert (string (sha1 ("123", 3).string ()) ==
           "40bd001563085fc35165329ea1ff5c5ecbdbbeef");
 
   {
+    sha1 h ("123");
+    assert (string (h.string ()) == "cc320164df1a2130045a28f08d3b88bc5bbcc43a");
+
+    assert (h.abbreviated_string (10) == "cc320164df");
+    assert (h.abbreviated_string (41) == h.string ());
+  }
+
+  {
     sha1 h;
     h.append ("1");
     h.append (string ("2"));
@@ -48,7 +53,6 @@ main ()
     auto& b (h.binary ());
     assert (b[0] == 0x58 && b[19] == 0xfd);
 
-    string s (h.string ());
-    assert (s == "58c596bafad8d007952934af1db9abc5401d4dfd");
+    assert (string (h.string ()) == "58c596bafad8d007952934af1db9abc5401d4dfd");
   }
 }
diff --git a/tests/sha256/driver.cxx b/tests/sha256/driver.cxx
index 191756c..6ba1cd1 100644
--- a/tests/sha256/driver.cxx
+++ b/tests/sha256/driver.cxx
@@ -33,13 +33,20 @@ main ()
   assert (string (sha256 ("").string ()) !=
           "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855");
 
-  assert (string (sha256 ("123").string ()) ==
-          "a787b6772e3e4df1b2a04d5eee56f8570ab38825eed1b6a9bda288429b7f29a1");
-
   assert (string (sha256 ("123", 3).string ()) ==
           "a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3");
 
   {
+    sha256 h ("123");
+
+    assert (string (h.string ()) ==
+            "a787b6772e3e4df1b2a04d5eee56f8570ab38825eed1b6a9bda288429b7f29a1");
+
+    assert (h.abbreviated_string (10) == "a787b6772e");
+    assert (h.abbreviated_string (65) == h.string ());
+  }
+
+  {
     sha256 h;
     h.append ("1");
     h.append (string ("2"));
@@ -48,8 +55,7 @@ main ()
     auto& b (h.binary ());
     assert (b[0] == 0x20 && b[31] == 0x9d);
 
-    string s (h.string ());
-    assert (s ==
+    assert (string (h.string ()) ==
             "204d9db65789fbede7829ed77f72ba1f0fe21a833d95abad4849b82f33a69b9d");
   }
 
@@ -71,5 +77,8 @@ main ()
     "f49dc002c6b66206a548ae8735329564c2b8c96d9b28856defcafa7f04b54fa6");
 
   assert (fingerprint_to_sha256 (fp) == sh);
+  assert (fingerprint_to_sha256 (fp, 65) == sh);
+  assert (fingerprint_to_sha256 (fp, 10) == sh.substr (0, 10));
+
   assert (sha256_to_fingerprint (sh) == fp);
 }