f42b7a6e10
The mokutil tool is using functions that were deprecated since OpenSSL 3.0 and needs to be ported to the newer functions that should be used instead. Resolves: rhbz#1958040 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
82 lines
2.7 KiB
Diff
82 lines
2.7 KiB
Diff
From d944337820debcaa5e275ec6a3523702ee2d9dd7 Mon Sep 17 00:00:00 2001
|
|
From: Gary Lin <glin@suse.com>
|
|
Date: Thu, 27 Aug 2020 14:48:08 +0800
|
|
Subject: [PATCH 2/2] man: remove "--simple-hash"
|
|
|
|
Remove "--simple-hash" from the man page.
|
|
|
|
Signed-off-by: Gary Lin <glin@suse.com>
|
|
---
|
|
man/mokutil.1 | 19 ++++++-------------
|
|
1 file changed, 6 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/man/mokutil.1 b/man/mokutil.1
|
|
index 446298763ad..1f82ff1abed 100644
|
|
--- a/man/mokutil.1
|
|
+++ b/man/mokutil.1
|
|
@@ -15,11 +15,11 @@ mokutil \- utility to manipulate machine owner keys
|
|
.br
|
|
\fBmokutil\fR [--import \fIkeylist\fR| -i \fIkeylist\fR]
|
|
([--hash-file \fIhashfile\fR | -f \fIhashfile\fR] | [--root-pw | -P] |
|
|
- [--simple-hash | -s] | [--mokx | -X])
|
|
+ [--mokx | -X])
|
|
.br
|
|
\fBmokutil\fR [--delete \fIkeylist\fR | -d \fIkeylist\fR]
|
|
([--hash-file \fIhashfile\fR | -f \fIhashfile\fR] | [--root-pw | -P] |
|
|
- [--simple-hash | -s] | [--mokx |- X])
|
|
+ [--mokx |- X])
|
|
.br
|
|
\fBmokutil\fR [--revoke-import]
|
|
([--mokx | -X])
|
|
@@ -30,11 +30,9 @@ mokutil \- utility to manipulate machine owner keys
|
|
\fBmokutil\fR [--export | -x]
|
|
.br
|
|
\fBmokutil\fR [--password | -p]
|
|
- ([--hash-file \fIhashfile\fR | -f \fIhashfile\fR] | [--root-pw | -P] |
|
|
- [--simple-hash | -s])
|
|
+ ([--hash-file \fIhashfile\fR | -f \fIhashfile\fR] | [--root-pw | -P])
|
|
.br
|
|
\fBmokutil\fR [--clear-password | -c]
|
|
- ([--simple-hash | -s])
|
|
.br
|
|
\fBmokutil\fR [--disable-validation]
|
|
.br
|
|
@@ -47,7 +45,7 @@ mokutil \- utility to manipulate machine owner keys
|
|
.br
|
|
\fBmokutil\fR [--reset]
|
|
([--hash-file \fIhashfile\fR | -f \fIhashfile\fR] | [--root-pw | -P] |
|
|
- [--simple-hash | -s] | [--mok | -X])
|
|
+ [--mok | -X])
|
|
.br
|
|
\fBmokutil\fR [--generate-hash=\fIpassword\fR | -g\fIpassword\fR]
|
|
.br
|
|
@@ -57,11 +55,11 @@ mokutil \- utility to manipulate machine owner keys
|
|
.br
|
|
\fBmokutil\fR [--import-hash \fIhash\fR]
|
|
([--hash-file \fIhashfile\fR | -f \fIhashfile\fR] | [--root-pw | -P] |
|
|
- [--simple-hash | -s] | [--mokx | -X])
|
|
+ [--mokx | -X])
|
|
.br
|
|
\fBmokutil\fR [--delete-hash \fIhash\fR]
|
|
([--hash-file \fIhashfile\fR | -f \fIhashfile\fR] | [--root-pw | -P] |
|
|
- [--simple-hash | -s] | [--mokx | -X])
|
|
+ [--mokx | -X])
|
|
.br
|
|
\fBmokutil\fR [--set-verbosity (\fItrue\fR | \fIfalse\fR)]
|
|
.br
|
|
@@ -138,11 +136,6 @@ Use the password hash from a specific file
|
|
\fB-P, --root-pw\fR
|
|
Use the root password hash from /etc/shadow
|
|
.TP
|
|
-\fB-s, --simple-hash\fR
|
|
-Use the old SHA256 password hash method to hash the password
|
|
-.br
|
|
-Note: --root-pw invalidates --simple-hash
|
|
-.TP
|
|
\fB--ignore-db\fR
|
|
Tell shim to not use the keys in db to verify EFI images
|
|
.TP
|
|
--
|
|
2.31.1
|
|
|