From: Andrey Rys Date: Sun, 25 Nov 2018 07:43:02 +0000 (+0700) Subject: tfcrypt: fixing hash output stream. X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=87d683181cc464de9b1d48483b72533aa9166cd3;p=tfcrypt.git tfcrypt: fixing hash output stream. --- diff --git a/VERSION b/VERSION index d00491f..0cfbf08 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1 +2 diff --git a/tfcrypt.c b/tfcrypt.c index dcf9ea9..6e30bc6 100644 --- a/tfcrypt.c +++ b/tfcrypt.c @@ -860,7 +860,7 @@ _xts2genkey: if (write(krfd, pblk, TF_FROM_BITS(TFC_KEY_BITS)) == -1) xerror(NO, switch (do_outfmt) { case TFC_OUTFMT_B64: tfc_printbase64(stderr, ctr, ctrsz, YES); break; case TFC_OUTFMT_RAW: write(2, ctr, ctrsz); break; - case TFC_OUTFMT_HEX: mhexdump(ctr, ctrsz, ctrsz, YES); break; + case TFC_OUTFMT_HEX: mehexdump(ctr, ctrsz, ctrsz, YES); break; } break; case TFC_CTR_RAND: tfc_getrandom(ctr, ctrsz); break; @@ -1093,7 +1093,7 @@ _macragain: lio = read(sfd, pblk, lrem); tfc_esay("%s: signature is good", progname); if (verbose) { if (do_outfmt == TFC_OUTFMT_B64) tfc_printbase64(stderr, macresult, TF_FROM_BITS(macbits), YES); - else mhexdump(macresult, TF_FROM_BITS(macbits), TF_FROM_BITS(macbits), YES); + else mehexdump(macresult, TF_FROM_BITS(macbits), TF_FROM_BITS(macbits), YES); } } }