prepare v0.3

tintinweb · Mar 20, 2016 · 527abbe · 527abbe
1 parent 5275210
commit 527abbe
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -60,11 +60,11 @@ Results:
 
     #> python -m striptls --help    # from pip/setup.py
     #> python striptls --help       # from source / root folder
-	Usage: striptls [options]
-	
-	       example: striptls --listen 0.0.0.0:25 --remote mail.server.tld:25
-	
-	
+        Usage: striptls.py [options]
+
+               example: striptls.py --listen 0.0.0.0:25 --remote mail.server.tld:25
+
+
         Options:
           -h, --help            show this help message and exit
           -v, --verbose         make lots of noise [default]
@@ -80,6 +80,7 @@ Results:
                                 ACAP.StripFromCapabilities, ACAP.StripWithError,
                                 ACAP.UntrustedIntercept, FTP.StripFromCapabilities,
                                 FTP.StripWithError, FTP.UntrustedIntercept,
+                                IMAP.ProtocolDowngradeToV2,
                                 IMAP.StripFromCapabilities, IMAP.StripWithError,
                                 IMAP.UntrustedIntercept,
                                 IRC.StripCAPWithNotRegistered,
@@ -88,16 +89,15 @@ Results:
                                 IRC.UntrustedIntercept, NNTP.StripFromCapabilities,
                                 NNTP.StripWithError, NNTP.UntrustedIntercept,
                                 POP3.StripFromCapabilities, POP3.StripWithError,
-                                POP3.UntrustedIntercept, SMTP.InjectCommand,
+                                POP3.UntrustedIntercept, SMTP.InboundStarttlsProxy,
+                                SMTP.InjectCommand,
                                 SMTP.ProtocolDowngradeStripExtendedMode,
-                                SMTP.ProtocolDowngradeToV2,
                                 SMTP.StripFromCapabilities, SMTP.StripWithError,
                                 SMTP.StripWithInvalidResponseCode,
                                 SMTP.StripWithTemporaryError, SMTP.UntrustedIntercept,
                                 XMPP.StripFromCapabilities, XMPP.StripInboundTLS,
                                 XMPP.UntrustedIntercept [default: ALL]
 
-
 ## Install (optional)
 
 from pip

diff --git a/README.rst b/README.rst
@@ -12,6 +12,7 @@ poc implementation of STARTTLS stripping attacks
 -  SMTP.StripWithTemporaryError
 -  SMTP.StripWithError
 -  SMTP.ProtocolDowngradeStripExtendedMode
+-  SMTP.InjectCommand
 -  POP3
 -  POP3.StripFromCapabilities
 -  POP3.StripWithError
@@ -20,6 +21,7 @@ poc implementation of STARTTLS stripping attacks
 -  IMAP.StripFromCapabilities
 -  IMAP.StripWithError
 -  IMAP.UntrustedIntercept
+-  IMAP.ProtocolDowngradeToV2
 -  FTP
 -  FTP.StripFromCapabilities
 -  FTP.StripWithError
@@ -32,6 +34,17 @@ poc implementation of STARTTLS stripping attacks
 -  XMPP.StripFromCapabilities
 -  XMPP.StripInboundTLS
 -  XMPP.UntrustedIntercept
+-  ACAP (untested)
+-  ACAP.StripFromCapabilities
+-  ACAP.StripWithError
+-  ACAP.UntrustedIntercept
+-  IRC
+-  IRC.StripFromCapabilities
+-  IRC.StripWithError
+-  IRC.UntrustedIntercept
+-  IRC.StripWithNotRegistered
+-  IRC.StripCAPWithNotregistered
+-  IRC.StripWithSilentDrop
 
 Results:
 
@@ -54,9 +67,9 @@ Usage
 
     #> python -m striptls --help    # from pip/setup.py
     #> python striptls --help       # from source / root folder
-    Usage: striptls [options]
+        Usage: striptls.py [options]
 
-           example: striptls --listen 0.0.0.0:25 --remote mail.server.tld:25
+               example: striptls.py --listen 0.0.0.0:25 --remote mail.server.tld:25
 
 
         Options:
@@ -71,12 +84,20 @@ Usage
           -x VECTORS, --vectors=VECTORS
                                 Comma separated list of vectors. Use 'ALL' (default)
                                 to select all vectors. Available vectors:
-                                FTP.StripFromCapabilities, FTP.StripWithError,
-                                FTP.UntrustedIntercept, IMAP.StripFromCapabilities,
-                                IMAP.StripWithError, IMAP.UntrustedIntercept,
-                                NNTP.StripFromCapabilities, NNTP.StripWithError,
-                                NNTP.UntrustedIntercept, POP3.StripFromCapabilities,
-                                POP3.StripWithError, POP3.UntrustedIntercept,
+                                ACAP.StripFromCapabilities, ACAP.StripWithError,
+                                ACAP.UntrustedIntercept, FTP.StripFromCapabilities,
+                                FTP.StripWithError, FTP.UntrustedIntercept,
+                                IMAP.ProtocolDowngradeToV2,
+                                IMAP.StripFromCapabilities, IMAP.StripWithError,
+                                IMAP.UntrustedIntercept,
+                                IRC.StripCAPWithNotRegistered,
+                                IRC.StripFromCapabilities, IRC.StripWithError,
+                                IRC.StripWithNotRegistered, IRC.StripWithSilentDrop,
+                                IRC.UntrustedIntercept, NNTP.StripFromCapabilities,
+                                NNTP.StripWithError, NNTP.UntrustedIntercept,
+                                POP3.StripFromCapabilities, POP3.StripWithError,
+                                POP3.UntrustedIntercept, SMTP.InboundStarttlsProxy,
+                                SMTP.InjectCommand,
                                 SMTP.ProtocolDowngradeStripExtendedMode,
                                 SMTP.StripFromCapabilities, SMTP.StripWithError,
                                 SMTP.StripWithInvalidResponseCode,
@@ -107,6 +128,7 @@ Examples
                       inbound                    outbound
     [inbound_peer]<------------->[listen:proxy]<------------->[outbound_peer/target]
       smtp-client                   striptls                    remote/target
+      
 
 local ``smtp-client`` -> ``localhost:8825`` (proxy) ->
 ``mail.gmx.net:25``

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@ def read(fname):
 
 setup(
     name="striptls",
-    version="0.2",
+    version="0.3",
     packages=["striptls"],
     author="tintinweb",
     author_email="tintinweb@oststrom.com",
@@ -18,7 +18,7 @@ def read(fname):
     license="GPLv2",
     keywords=["striptls", "starttls", "strip", "attack", "proxy"],
     url="https://github.com/tintinweb/striptls/",
-    download_url="https://github.com/tintinweb/striptls/tarball/v0.2",
+    download_url="https://github.com/tintinweb/striptls/tarball/v0.3",
     #python setup.py register -r https://testpypi.python.org/pypi
     long_description=read("README.rst") if os.path.isfile("README.rst") else read("README.md"),
     install_requires=[],