Merge branch 'master' of ssh://moria/home/mbr/git/fwknop

This commit is contained in:
Michael Rash 2017-03-28 22:57:12 -04:00
commit 013509832e
2 changed files with 4 additions and 4 deletions

View File

@ -66,7 +66,7 @@ SPA daemon reconfigures the firewall to temporarily grant access to a passively
authenticated SPA client: authenticated SPA client:
![alt text][SPA-basic-access-SSHD] ![alt text][SPA-basic-access-SSHD]
[SPA-basic-access-SSHD]: /doc/images/SPA_basic.png "Basic SPA usage to access SSHD" [SPA-basic-access-SSHD]: doc/images/SPA_basic.png "Basic SPA usage to access SSHD"
fwknop supports the above, but also goes much further and makes robust usage of NAT fwknop supports the above, but also goes much further and makes robust usage of NAT
(for iptables/firewalld firewalls). After all, *important* firewalls are usually gateways (for iptables/firewalld firewalls). After all, *important* firewalls are usually gateways
@ -81,7 +81,7 @@ applications on modern traditional networks, it also allows fwknop to support cl
computing environments such as Amazon's AWS: computing environments such as Amazon's AWS:
![alt text][SPA-Amazon-AWS-cloud] ![alt text][SPA-Amazon-AWS-cloud]
[SPA-Amazon-AWS-cloud]: /doc/images/SPA_AWS_network_setup.png "SPA usage on Amazon AWS cloud environments" [SPA-Amazon-AWS-cloud]: doc/images/SPA_AWS_network_setup.png "SPA usage on Amazon AWS cloud environments"
## User Interface ## User Interface
The official cross-platform fwknop client user interface *fwknop-gui* The official cross-platform fwknop client user interface *fwknop-gui*
@ -91,7 +91,7 @@ including NAT requests, HMAC and Rijndael keys (GnuPG is not yet supported), fwk
stanza saving, and more. Currently fwknop-gui runs on Linux, Mac OS X, and stanza saving, and more. Currently fwknop-gui runs on Linux, Mac OS X, and
Windows - here is a screenshot from OS X: Windows - here is a screenshot from OS X:
![alt text][fwknop-gui-OS-X-screenshot] ![alt text][fwknop-gui-OS-X-screenshot]
[fwknop-gui-OS-X-screenshot]: /doc/images/fwknop-gui-OSX.png "fwknop-gui on Mac OS X" [fwknop-gui-OS-X-screenshot]: doc/images/fwknop-gui-OSX.png "fwknop-gui on Mac OS X"
Similarly, an updated Similarly, an updated
[Android client](https://github.com/jp-bennett/Fwknop2) is [Android client](https://github.com/jp-bennett/Fwknop2) is
[available](https://incomsystems.biz/fwknop-gui/android.php) as well. [available](https://incomsystems.biz/fwknop-gui/android.php) as well.

View File

@ -4076,7 +4076,7 @@ sub fuzzing_encryption_keys() {
sub fuzzing_hmac_keys() { sub fuzzing_hmac_keys() {
my @keys = ( my @keys = (
'A'x129, # 'A'x129,
'A'x1000, 'A'x1000,
'A'x2000, 'A'x2000,
); );