From 0ef8e641679be571696ae46a6fd5591117790bf6 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Mon, 10 Jun 2024 10:23:23 -0700 Subject: [PATCH] scryptenc: fix API comment scryptdec_file_load_header: trivial style mistake. scryptdec_file_prep: missing ${verbose}, should have been part of: 2018-05-14 scryptdec_file(): refactor with scryptdec_file_prep() abfd77eb6962e319a38cfe39c3e7f5b76a134736 --- lib/scryptenc/scryptenc.c | 5 +++-- lib/scryptenc/scryptenc.h | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/scryptenc/scryptenc.c b/lib/scryptenc/scryptenc.c index b9105b6c..5f87382b 100644 --- a/lib/scryptenc/scryptenc.c +++ b/lib/scryptenc/scryptenc.c @@ -58,7 +58,7 @@ static int checkparams(size_t, double, double, int, uint32_t, uint32_t, int, #ifdef POSIXFAIL_ABSTRACT_DECLARATOR static int scryptdec_file_load_header(FILE * infile, uint8_t header[static 96]); #else -static int scryptdec_file_load_header(FILE *, uint8_t [static 96]); +static int scryptdec_file_load_header(FILE *, uint8_t[static 96]); #endif struct scryptdec_file_cookie { @@ -734,7 +734,8 @@ scryptdec_file_load_header(FILE * infile, uint8_t header[static 96]) } /** - * scryptdec_file_prep(infile, passwd, passwdlen, params, force, cookie): + * scryptdec_file_prep(infile, passwd, passwdlen, params, verbose, force, + * cookie): * Prepare to decrypt ${infile}, including checking the passphrase. Allocate * a cookie at ${cookie}. After calling this function, ${infile} should not * be modified until the decryption is completed by scryptdec_file_copy(). diff --git a/lib/scryptenc/scryptenc.h b/lib/scryptenc/scryptenc.h index 88fa664f..491dcc14 100644 --- a/lib/scryptenc/scryptenc.h +++ b/lib/scryptenc/scryptenc.h @@ -151,7 +151,8 @@ int scryptdec_file(FILE *, FILE *, const uint8_t *, size_t, struct scryptenc_params *, int, int); /** - * scryptdec_file_prep(infile, passwd, passwdlen, params, force, cookie): + * scryptdec_file_prep(infile, passwd, passwdlen, params, verbose, force, + * cookie): * Prepare to decrypt ${infile}, including checking the passphrase. Allocate * a cookie at ${cookie}. After calling this function, ${infile} should not * be modified until the decryption is completed by scryptdec_file_copy().