diff options
| author | hydrajump <wave@hydrajump.com> | 2014-04-02 21:17:22 +0200 |
|---|---|---|
| committer | hydrajump <wave@hydrajump.com> | 2014-04-02 21:17:22 +0200 |
| commit | 5f5d4ff3b29c40d8d0c86e6eaac2820183daf89b (patch) | |
| tree | 95972769d31123ef77ebc1dc1c3439b7d95968a7 | |
| parent | 3b64999fe118407c4645406e3264d70ae7c08d94 (diff) | |
| download | vyatta-cfg-system-5f5d4ff3b29c40d8d0c86e6eaac2820183daf89b.tar.gz vyatta-cfg-system-5f5d4ff3b29c40d8d0c86e6eaac2820183daf89b.zip | |
Delete SSH blacklists as they are no longer needed
The SSH blacklists were committed 5 years ago and the
original contributor does not recall why they were added.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | debian/vyatta-cfg-system.postinst.in | 14 | ||||
| -rw-r--r-- | sysconf/blacklist.DSA-1024 | 21 | ||||
| -rw-r--r-- | sysconf/blacklist.RSA-2048 | 21 |
4 files changed, 0 insertions, 58 deletions
diff --git a/Makefile.am b/Makefile.am index e893fa71..e17669eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,8 +95,6 @@ sysconf_DATA += sysconf/ntp.conf sysconf_DATA += sysconf/default_ssh sysconf_DATA += sysconf/securetty sysconf_DATA += sysconf/vyatta-sysctl.conf -sysconf_DATA += sysconf/blacklist.DSA-1024 -sysconf_DATA += sysconf/blacklist.RSA-2048 sysconf_DATA += sysconf/level sysconf_DATA += sysconf/pam_radius.cfg sysconf_DATA += sysconf/filecaps diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index cf9eecdb..735b49ff 100755 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -76,20 +76,6 @@ if [ "$sysconfdir" != "/etc" ]; then cp $sysconfdir/sudoers /etc/sudoers.d/vyatta chmod 0440 /etc/sudoers.d/vyatta - # set up blacklists - for f in blacklist.DSA-1024 blacklist.RSA-2048; do - if [ -r "/etc/ssh/$f" ]; then - l=$(head -1 $sysconfdir/$f) - if ! grep -q "$l" /etc/ssh/$f; then - tmp=$(mktemp /tmp/bl.XXXXXXXXXX) - cat /etc/ssh/$f $sysconfdir/$f | sort >$tmp - mv $tmp /etc/ssh/$f - fi - else - cp $sysconfdir/$f /etc/ssh/$f - fi - done - # purge off ancient devfs stuff from /etc/securetty cp $sysconfdir/securetty /etc/securetty diff --git a/sysconf/blacklist.DSA-1024 b/sysconf/blacklist.DSA-1024 deleted file mode 100644 index 74ecaf53..00000000 --- a/sysconf/blacklist.DSA-1024 +++ /dev/null @@ -1,21 +0,0 @@ -01e53715431bcae79677 -036a4048556eb8092113 -0db19fcc95efc89d2173 -22da67b6aafc3df124f3 -2307b2e9769c6b66857c -3c13948cb606c6041284 -4218a1912ef9941a0881 -4582eff4cf42af0b19f0 -54f103cd4fbc7b08c8e2 -6d56bcebc8bb9d30ecd9 -83848247dbabf6135644 -8e730ef49b321946e7aa -96a4f81de014a53e1890 -9adab16d72364f6032f7 -9b25df69798b447fd5ee -9d5e4438920babd3030e -a1eeb08f514492069e51 -d63657291b4d940a9a47 -db3101e70b8ef04ad4fe -dd71e503f1a8319e3caf -f407f33616b53f79c1b8 diff --git a/sysconf/blacklist.RSA-2048 b/sysconf/blacklist.RSA-2048 deleted file mode 100644 index 0cb0d489..00000000 --- a/sysconf/blacklist.RSA-2048 +++ /dev/null @@ -1,21 +0,0 @@ -0a47235c3142262b3b90 -1899b9c1f6346576a66e -20059ae36e5ac97fc3b2 -2487f28e692f45affa43 -4394e40d532aef252906 -440ea42b848111613a48 -46a6daa5036020063340 -52287579c05c0e45c57e -52cec5c2a10c09661389 -6b3446654ce7e07da10d -768e7f724aeb0cf86814 -84d1e68fda77b8fe88bf -b0e10f3cfca7ac4aba50 -b8570f784995af2fa6b8 -bcdc020d5e8e6a61345a -c3e94aed4f1d75569eab -c5d8c5731f3fa668ffae -d9deed191624c2472978 -e66c42ba8e40c8501106 -ea93328c2d72642a5d59 -f954c671c9c639f8a375 |