keygen: Reflect change in knet

Knet commit 1cb36f0cffd4559971826ca4774a88c5b05882fb reduced minimal
key length to 1024-bit. Keygen should keep compatibility with already
released 3.0.[0-1] so default key length should be 2048 bits. It's
possible to use -s argument to generate shorter key - keygen respects
minimum/maximum as defined by knet.

Also fix man page to reflect this change.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
This commit is contained in:
Jan Friesse 2019-04-09 17:09:34 +02:00
parent 03fba21503
commit c260bce45b
2 changed files with 11 additions and 14 deletions

View File

@ -1,5 +1,5 @@
.\"/*
.\" * Copyright (C) 2010-2017 Red Hat, Inc.
.\" * Copyright (C) 2010-2019 Red Hat, Inc.
.\" *
.\" * All rights reserved.
.\" *
@ -31,7 +31,7 @@
.\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" * THE POSSIBILITY OF SUCH DAMAGE.
.\" */
.TH COROSYNC-KEYGEN 8 2017-07-03
.TH COROSYNC-KEYGEN 8 2019-04-09
.SH NAME
corosync-keygen \- Generate an authentication key for Corosync.
.SH SYNOPSIS
@ -69,7 +69,7 @@ Random number source file. Default is /dev/urandom. As an example /dev/random ma
used when really superb randomness is needed.
.TP
.B -s size
Size of the generated key in bytes. Default is 1024 bytes. Allowed range is <1024, 4096>.
Size of the generated key in bytes. Default is 256 bytes. Allowed range is <128, 4096>.
.TP
.TP
.B -l
@ -84,7 +84,7 @@ Generate the key.
.nf
# corosync-keygen
Corosync Cluster Engine Authentication key generator.
Gathering 8192 bits for key from /dev/urandom.
Gathering 2048 bits for key from /dev/urandom.
Writing corosync key to /etc/corosync/authkey
.fi
@ -101,15 +101,12 @@ Writing corosync key to /tmp/authkey.
Generate superb key using /dev/random
.nf
# corosync-keygen -r /dev/random
Corosync Cluster Engine Authentication key generator.
Gathering 8192 bits for key from /dev/random.
Gathering 2048 bits for key from /dev/random.
Press keys on your keyboard to generate entropy.
Press keys on your keyboard to generate entropy (7928 bits still needed).
Press keys on your keyboard to generate entropy (7880 bits still needed).
...
Press keys on your keyboard to generate entropy (104 bits still needed).
Press keys on your keyboard to generate entropy (56 bits still needed).
Press keys on your keyboard to generate entropy (8 bits still needed).
Press keys on your keyboard to generate entropy (1128 bits still needed).
Press keys on your keyboard to generate entropy (504 bits still needed).
Press keys on your keyboard to generate entropy (128 bits still needed).
Press keys on your keyboard to generate entropy (32 bits still needed).
Writing corosync key to /etc/corosync/authkey.
.fi

View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 2004 MontaVista Software, Inc.
* Copyright (c) 2005-2017 Red Hat, Inc.
* Copyright (c) 2005-2019 Red Hat, Inc.
*
* All rights reserved.
*
@ -52,7 +52,7 @@
#define DEFAULT_KEYFILE COROSYSCONFDIR "/authkey"
#define DEFAULT_KEYFILE_LEN TOTEM_PRIVATE_KEY_LEN_MIN
#define DEFAULT_KEYFILE_LEN 256
#define DEFAULT_RANDOM_DEV "/dev/urandom"