Merge cipher_order into master

Author: rbsec

Changelog

@@ -1,6 +1,20 @@
 Changelog
 =========
 
+Version: 1.11.0
+Date   : 24/09/2015
+Author : rbsec <robin@rbsec.net>
+Changes: The following are a list of changes
+         > Rewrote ciphersuite scanning engine to be much faster
+         > Ciphers are now output in order of server preference
+         > Most secure protocols are scanned first (TLSv1.2 -> SSLv2)
+         > All protocols are tried when trying to obtain the certificate
+         > Obselete --failed and --no-preferred-ciphers options removed
+         > Flag TLSv1.0 ciphers in output
+         > Flag 56 bit ciphers as red, not yellow
+         > Fix building on OpenBSD (credit Stuart Henderson)
+         > Fix incorrect output when server prefers NULL ciphers
+
 Version: 1.10.6
 Date   : 06/08/2015
 Author : rbsec <robin@rbsec.net>

sslscan.1

@@ -57,10 +57,6 @@ Don't flag certificates signed with weak algorithms (MD5 and SHA-1) or short (<2
 .B \-\-show\-client\-cas
 Show a list of CAs that the server allows for client authentication. Will be blank for IIS/Schannel servers.
 .TP
-.B \-\-failed
-Show rejected ciphers
-(default is to listing only accepted ciphers)
-.TP
 .B \-\-ssl2
 .br
 Only check SSLv2 ciphers
@@ -106,7 +102,7 @@ The password for the private key or PKCS#12 file
 A file containing PEM/ASN1 formatted client certificates
 .TP
 .B \-\-no\-ciphersuites
-Only check for supported SSL/TLS versions, not ciphersuites
+Do not scan for supported ciphersuites.
 .TP
 .B \-\-no\-renegotiation
 Do not check for secure TLS renegotiation
@@ -117,9 +113,6 @@ Do not check for TLS compression (CRIME)
 .B \-\-no\-heartbleed
 Do not check for OpenSSL Heartbleed (CVE-2014-0160)
 .TP
-.B \-\-no\-preferred
-Do not check for preferred ciphersuites
-.TP
 .B \-\-starttls\-ftp
 STARTTLS setup for FTP
 .TP