rpms
/
openssh
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into f21

This commit is contained in:
Petr Lautrbach 2014-09-23 12:33:53 +02:00
parent 54097638b5 c8fc193f3d
commit a8b57d6ad1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sshd-keygen
View File

@ -71,7 +71,7 @@ do_rsa_keygen() {
}
do_dsa_keygen() {
if [ ! -s $DSA_KEY ]; then
if [ ! -s $DSA_KEY -a `fips_enabled` -eq 0 ]; then
echo -n $"Generating SSH2 DSA host key: "
rm -f $DSA_KEY
if test ! -f $DSA_KEY && $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then
@ -113,7 +113,7 @@ do_ecdsa_keygen() {
}
do_ed25519_keygen() {
if [ ! -s $ED25519_KEY ]; then
if [ ! -s $ED25519_KEY -a `fips_enabled` -eq 0 ]; then
echo -n $"Generating SSH2 ED25519 host key: "
rm -f $ED25519_KEY
if test ! -f $ED25519_KEY && $KEYGEN -q -t ed25519 -f $ED25519_KEY -C '' -N '' >&/dev/null; then