Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nettle
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
5
Merge Requests
5
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Nettle
nettle
Commits
99f954f7
Commit
99f954f7
authored
Jan 26, 2016
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix handling of unrecognized options for nettle-hash and nettle-pbkdf2.
parent
35666208
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
9 deletions
+29
-9
ChangeLog
ChangeLog
+8
-0
tools/nettle-hash.c
tools/nettle-hash.c
+17
-8
tools/nettle-pbkdf2.c
tools/nettle-pbkdf2.c
+4
-1
No files found.
ChangeLog
View file @
99f954f7
2016-01-26 Niels Möller <nisse@lysator.liu.se>
* tools/nettle-pbkdf2.c (main): Fix handling of unrecognized
options. Bug reported by Dongsheng Zhang. Display usage message
and exit non-zero. Also added "Usage: "-prefix to the message.
* tools/nettle-hash.c (usage): New function, extracted from main.
(main): Analogous fix for unrecognized options.
2016-01-23 Niels Möller <nisse@lysator.liu.se>
* nettle.texinfo: Set UPDATED-FOR to 3.2.
...
...
tools/nettle-hash.c
View file @
99f954f7
...
...
@@ -134,6 +134,19 @@ digest_file(const struct nettle_hash *alg,
return
1
;
}
static
void
usage
(
FILE
*
f
)
{
fprintf
(
f
,
"Usage: nettle-hash -a ALGORITHM [OPTIONS] [FILE ...]
\n
"
"Options:
\n
"
" --help Show this help.
\n
"
" -V, --version Show version information.
\n
"
" --list List supported hash algorithms.
\n
"
" -a, --algorithm=ALG Hash algorithm to use.
\n
"
" -l, --length=LENGTH Desired digest length (octets)
\n
"
" --raw Raw binary output.
\n
"
);
}
/* FIXME: Be more compatible with md5sum and sha1sum. Options -c
(check), -b (binary), -t (text), and output format with hex hash
sum, optional star (meaning binary mode), and file name. */
...
...
@@ -165,15 +178,11 @@ main (int argc, char **argv)
{
default:
abort
();
case
'?'
:
usage
(
stderr
);
return
EXIT_FAILURE
;
case
OPT_HELP
:
printf
(
"nettle-hash -a ALGORITHM [OPTIONS] [FILE ...]
\n
"
"Options:
\n
"
" --help Show this help.
\n
"
" -V, --version Show version information.
\n
"
" --list List supported hash algorithms.
\n
"
" -a, --algorithm=ALG Hash algorithm to use.
\n
"
" -l, --length=LENGTH Desired digest length (octets)
\n
"
" --raw Raw binary output.
\n
"
);
usage
(
stdout
);
return
EXIT_SUCCESS
;
case
'V'
:
printf
(
"nettle-hash ("
PACKAGE_STRING
")
\n
"
);
...
...
tools/nettle-pbkdf2.c
View file @
99f954f7
...
...
@@ -51,7 +51,7 @@
static
void
usage
(
FILE
*
f
)
{
fprintf
(
f
,
"nettle-pbkdf2 [OPTIONS] SALT
\n
"
fprintf
(
f
,
"
Usage:
nettle-pbkdf2 [OPTIONS] SALT
\n
"
"Options:
\n
"
" --help Show this help.
\n
"
" -V, --version Show version information.
\n
"
...
...
@@ -97,6 +97,9 @@ main (int argc, char **argv)
{
default:
abort
();
case
'?'
:
usage
(
stderr
);
return
EXIT_FAILURE
;
case
OPT_HELP
:
usage
(
stdout
);
return
EXIT_SUCCESS
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment