d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usr.sbin/uefisign: prevent specifying certificate, key or output

Browse Source 
multiple times.

MFC after:	1 month
This commit is contained in:
Xin LI 2021-03-21 10:12:34 -07:00
parent d22883d715
commit 6234a0bfc8
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/uefisign/uefisign.c
View File

@ -350,13 +350,22 @@ main(int argc, char **argv)
Vflag = true;
break;
case 'c':
certpath = checked_strdup(optarg);
if (certpath == NULL)
certpath = checked_strdup(optarg);
else
err(1, "-c can only be specified once");
break;
case 'k':
keypath = checked_strdup(optarg);
if (keypath == NULL)
keypath = checked_strdup(optarg);
else
err(1, "-k can only be specified once");
break;
case 'o':
outpath = checked_strdup(optarg);
if (outpath == NULL)
outpath = checked_strdup(optarg);
else
err(1, "-o can only be specified once");
break;
case 'v':
vflag = true;
@ -402,7 +411,7 @@ main(int argc, char **argv)
err(1, "fork");
if (pid == 0)
return (child(inpath, outpath, pipefds[1], Vflag, vflag));
exit(child(inpath, outpath, pipefds[1], Vflag, vflag));
if (!Vflag) {
certfp = checked_fopen(certpath, "r");
@ -422,5 +431,5 @@ main(int argc, char **argv)
sign(cert, key, pipefds[0]);
}
return (wait_for_child(pid));
exit(wait_for_child(pid));
}