From 871befaf01a47c39f110054e34b9ad9076191f72 Mon Sep 17 00:00:00 2001 From: Chris Oei Date: Sat, 8 Sep 2012 16:58:33 -0700 Subject: [PATCH] Updated tests --- test/test.bash | 4 ++-- test/test_results.reference | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/test/test.bash b/test/test.bash index 3fea04e..3a65345 100755 --- a/test/test.bash +++ b/test/test.bash @@ -4,12 +4,12 @@ PROG=./scrypt-genpass RESULTS=test/test_results.log $PROG -t > $RESULTS 2>&1 -$PROG -h >> $RESULTS 2>&1 +($PROG -h |grep -v Version)>> $RESULTS 2>&1 $PROG -p b a >> $RESULTS 2>&1 $PROG -k test/keyfile1.dat -p abc ghi >> $RESULTS 2>&1 $PROG -l 2 -p a a >> $RESULTS 2>&1 $PROG -l 65 -p a a >> $RESULTS 2>&1 $PROG -l 64 -p a a >> $RESULTS 2>&1 -$PROG -l 4 -p "Speak, friend, and enter." "The Doors of Durin" >> $RESULTS 2>&1 +$PROG -n -l 4 -p "Speak, friend, and enter." "The Doors of Durin" >> $RESULTS 2>&1 diff $RESULTS test/test_results.reference diff --git a/test/test_results.reference b/test/test_results.reference index dfe80a7..7f5b33f 100644 --- a/test/test_results.reference +++ b/test/test_results.reference @@ -1,6 +1,7 @@ All internal tests pass usage: scrypt-genpass [-l LEN] [-m MAXMEM] [-n] [-o MAXOPS] [-k KEYFILE] [-p PASS] scrypt-genpass -t +Version: 3194765 Master hex: 3e23e8160039594a33894f6564e1b1348bbd7a0088d42c4acb73eeaed59c009d Site hex: ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb Pass hex: 0160b45a147d0a0f5b6976a7ab698554a41c06c5f77cc9d77b06304265d1646fdc8e3119474748778ab3b68a39d0a67b3a92b41a8ddb45d4bb6ebec20a5f4a57 @@ -12,16 +13,16 @@ Generated password: i6XEwZJmAqjJzagl scrypt-genpass: Unable to generate password for output length 2: Undefined error: 0 Master hex: ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb Site hex: ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb -Pass hex: 4394a3d67ecf5faa9ee733225147a7b58be00c497d990ad0ff4a5c63c608f843160924503886964e275867c1885cf73e072ebbed617088ae8f864d672e656097 +Pass hex: ae0abc722d2db07ab1b70e7be8de90967ef1bbcf8d06a5213b74edb51cee9392da7488beecf6296b94bf0ec807b0ebd6e652fbb7aa909e25d2c10b8fe60b7c20 scrypt-genpass: Unable to generate password for output length 65: Undefined error: 0 Master hex: ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb Site hex: ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb -Pass hex: fcd149fda370967694b85b3e29edba64c68a0fe3b679770aec240b3cf460222c9d259f8b38064c1f07628dc2050a205cf52d498b300aa3851a9d0de5d0a27aa8 +Pass hex: ae0abc722d2db07ab1b70e7be8de90967ef1bbcf8d06a5213b74edb51cee9392da7488beecf6296b94bf0ec807b0ebd6e652fbb7aa909e25d2c10b8fe60b7c20 Master hex: ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb Site hex: ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb -Pass hex: fcd149fda370967694b85b3e29edba64c68a0fe3b679770aec240b3cf460222c9d259f8b38064c1f07628dc2050a205cf52d498b300aa3851a9d0de5d0a27aa8 -Generated password: s9VfNYA4y8DaPZaMmopP675kYKl86IISHLJp4goFhKrifkGE7TlpWkNjAHnRwM8S +Pass hex: ae0abc722d2db07ab1b70e7be8de90967ef1bbcf8d06a5213b74edb51cee9392da7488beecf6296b94bf0ec807b0ebd6e652fbb7aa909e25d2c10b8fe60b7c20 +Generated password: s0G0TT0817o9UKuAc3bvrgPH72Z5C0xwG2meY8PTyfooh0XCSud7UuILyhltSlaG Master hex: 319c8c993599782ea06a815ece43de8920a4d36e03ab85855b4bab96311b9ba6 Site hex: 9dec4c078ad50db0b21292d0c72bb0fc20326ea766ed358340c6b22f79615e88 -Pass hex: 5c63721e7af2f61b3b7537fb66fc52c6c17f0fb0e83959b75cd6ba1ec415f0e42984d1379e4af6dd534de9cc431a4b3cedb97ce80a2f7f0a6bd85a3951685a97 -Generated password: o9KE +Pass hex: e54a789bb7ed4859377275dac479cd72e69f8510018c6ad1cd05750fd406b1d3de9e3eb68637c4bdb2ea4cd0c5b8598a179c3e5c8022beec9bb4e53ee4e09794 +Generated password: 9405