From 0b6febadb714c3d5a62779fef076d88f066a61ba Mon Sep 17 00:00:00 2001 From: jhurst Date: Wed, 15 Jul 2020 13:23:19 -0700 Subject: replaced openssl dependency with internal SHA-1 API --- src/asdcp-util.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/asdcp-util.cpp') diff --git a/src/asdcp-util.cpp b/src/asdcp-util.cpp index a3c891d..3f70a0a 100755 --- a/src/asdcp-util.cpp +++ b/src/asdcp-util.cpp @@ -35,8 +35,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include +#include #include -#include using namespace Kumu; @@ -182,7 +182,7 @@ Result_t digest_file(const std::string& filename) { FileReader Reader; - SHA_CTX Ctx; + SHA1_CTX Ctx; SHA1_Init(&Ctx); ByteString Buf(8192); -- cgit v1.2.3 From f675e78b9c59dad48807285375ee2e885667a12b Mon Sep 17 00:00:00 2001 From: jhurst Date: Sun, 19 Jul 2020 11:34:35 -0700 Subject: refactored to use Kumu data types instead of raw buffers --- src/asdcp-util.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/asdcp-util.cpp') diff --git a/src/asdcp-util.cpp b/src/asdcp-util.cpp index 3f70a0a..d93465c 100755 --- a/src/asdcp-util.cpp +++ b/src/asdcp-util.cpp @@ -244,17 +244,15 @@ main(int argc, const char** argv) if ( Options.mode == MMT_GEN_KEY ) { - Kumu::FortunaRNG RNG; - byte_t bin_buf[ASDCP::KeyLen]; - - RNG.FillRandom(bin_buf, ASDCP::KeyLen); - printf("%s\n", Kumu::bin2hex(bin_buf, ASDCP::KeyLen, str_buf, 64)); + SymmetricKey key_value; + Kumu::GenRandomValue(key_value); + printf("%s\n", key_value.EncodeHex(str_buf, 64)); } else if ( Options.mode == MMT_GEN_ID ) { - UUID TmpID; - Kumu::GenRandomValue(TmpID); - printf("%s\n", TmpID.EncodeHex(str_buf, 64)); + UUID id_value; + Kumu::GenRandomValue(id_value); + printf("%s\n", id_value.EncodeHex(str_buf, 64)); } else if ( Options.mode == MMT_DIGEST ) { -- cgit v1.2.3