Minor changes

dhondta · dhondta · commit a260fa3c8edb · 2021-06-28T19:07:56.000+02:00
diff --git a/README.md b/README.md
@@ -193,7 +193,7 @@ o
 `radio` | text <-> radio words | aka NATO or radio phonetic alphabet
 `resistor` | text <-> resistor colors | aka resistor color codes
 `rot` | text <-> rot(N) ciphertext | aka Caesar cipher (N belongs to [1,25])
-`rotate` | text <-> N-bits-rotated text | rotates characters by the specified number of bits
+`rotate` | text <-> N-bits-rotated text | rotates characters by the specified number of bits ; Python 3 only
 `scytale` | text <-> scytale ciphertext | encrypts with L, the number of letters on the rod (belongs to [1,[)
 `shift` | text <-> shift(N) ciphertext | shift ordinals with N (belongs to [1,255])
 `sms` | text <-> phone keystrokes | also called T9 code ; uses "`-`" as a separator for encoding, "`-`" or "`_`" or whitespace for decoding
diff --git a/codext/crypto/barbie.py b/codext/crypto/barbie.py
@@ -22,7 +22,7 @@
     'enc(barbie3|barbie_3|barbie-3)': {'this is a test': "fpsu su h ftuf"},
     'enc(barbie4|barbie_4|barbie-4)': {'this is a test': "pufq fq s phqp"},
 }
-__guess__ = ["barbie%d" % i for i in range(1, 5)]
+__guess__ = ["barbie-%d" % i for i in range(1, 5)]
 
 
 STD = [
diff --git a/codext/crypto/rot.py b/codext/crypto/rot.py
@@ -18,7 +18,7 @@
     'enc(rot3|caesar-3)':       {'this is a test': "wklv lv d whvw"},
     'enc(rot47)':               {'this is a test': "E9:D :D 2 E6DE"},
 }
-__guess__ = ["rot%d" % i for i in range(1, 26)] + ["rot47"]
+__guess__ = ["rot-%d" % i for i in range(1, 26)] + ["rot-47"]
 
 
 ROT47 = "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
diff --git a/codext/crypto/scytale.py b/codext/crypto/scytale.py
@@ -17,7 +17,7 @@
     'enc(scytale2|scytale-2|scytale_2)':   {'this is a test': "ti satshsi  et"},
     'enc(scytale5|scytale-5|scytale_5)':   {'this is a test': "tithsei ssat  "},
 }
-__guess__ = ["scytale%d" % i for i in range(10)]
+__guess__ = ["scytale-%d" % i for i in range(10)]
 
 
 PADDING_CHAR = ""
diff --git a/codext/crypto/shift.py b/codext/crypto/shift.py
@@ -15,7 +15,7 @@
     'enc(shift1|shift_1|shift-1)':    {'this is a test': "uijt!jt!b!uftu"},
     'enc(shift9|shift_9|shift-9)':    {'this is a test': "}qr|)r|)j)}n|}"},
 }
-__guess__ = ["shift%d" % i for i in range(1, 256)]
+__guess__ = ["shift-%d" % i for i in range(1, 256)]
 
 
 def ord_shift_decode(i):
diff --git a/codext/crypto/xor.py b/codext/crypto/xor.py
@@ -16,7 +16,7 @@
     'enc(xor3|xor-3|xor_3)':           {'wkjp#jp#b#wfpw': "this is a test"},
     'enc(xor6|xor-6|xor_6)':           {'this is a test': "rnou&ou&g&rcur"},
 }
-__guess__ = ["xor%d" % i for i in range(1, 256)]
+__guess__ = ["xor-%d" % i for i in range(1, 256)]
 
 
 def _xorn(text, n=1):
diff --git a/codext/stegano/whitespace.py b/codext/stegano/whitespace.py
@@ -63,6 +63,6 @@ def decode(text, errors="strict"):
 
 
 op = r"[+-](?:\d+(?:\.\d+)?[*/])?"
-add("whitespace_after_before", wsba_encode, wsba_decode, guess=__guess2__, entropy=1., printables_rate=1.,
+add("whitespace_after_before", wsba_encode, wsba_decode, guess=__guess2__, entropy=1., printables_rate=1., penalty=.1,
     pattern=r"whitespace("+op+r"before"+op+r"after|"+op+r"after"+op+r"before)$")
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`'enc(barbie3\|barbie_3\|barbie-3)': {'this is a test': "fpsu su h ftuf"},`
`23`	`23`	`'enc(barbie4\|barbie_4\|barbie-4)': {'this is a test': "pufq fq s phqp"},`
`24`	`24`	`}`
`25`		`-__guess__ = ["barbie%d" % i for i in range(1, 5)]`
	`25`	`+__guess__ = ["barbie-%d" % i for i in range(1, 5)]`
`26`	`26`
`27`	`27`
`28`	`28`	`STD = [`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`'enc(rot3\|caesar-3)': {'this is a test': "wklv lv d whvw"},`
`19`	`19`	`'enc(rot47)': {'this is a test': "E9:D :D 2 E6DE"},`
`20`	`20`	`}`
`21`		`-__guess__ = ["rot%d" % i for i in range(1, 26)] + ["rot47"]`
	`21`	`+__guess__ = ["rot-%d" % i for i in range(1, 26)] + ["rot-47"]`
`22`	`22`
`23`	`23`
`24`	`24`	ROT47 = "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{\|}~"
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`'enc(scytale2\|scytale-2\|scytale_2)': {'this is a test': "ti satshsi et"},`
`18`	`18`	`'enc(scytale5\|scytale-5\|scytale_5)': {'this is a test': "tithsei ssat "},`
`19`	`19`	`}`
`20`		`-__guess__ = ["scytale%d" % i for i in range(10)]`
	`20`	`+__guess__ = ["scytale-%d" % i for i in range(10)]`
`21`	`21`
`22`	`22`
`23`	`23`	`PADDING_CHAR = ""`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`'enc(shift1\|shift_1\|shift-1)': {'this is a test': "uijt!jt!b!uftu"},`
`16`	`16`	`'enc(shift9\|shift_9\|shift-9)': {'this is a test': "}qr\|)r\|)j)}n\|}"},`
`17`	`17`	`}`
`18`		`-__guess__ = ["shift%d" % i for i in range(1, 256)]`
	`18`	`+__guess__ = ["shift-%d" % i for i in range(1, 256)]`
`19`	`19`
`20`	`20`
`21`	`21`	`def ord_shift_decode(i):`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`'enc(xor3\|xor-3\|xor_3)': {'wkjp#jp#b#wfpw': "this is a test"},`
`17`	`17`	`'enc(xor6\|xor-6\|xor_6)': {'this is a test': "rnou&ou&g&rcur"},`
`18`	`18`	`}`
`19`		`-__guess__ = ["xor%d" % i for i in range(1, 256)]`
	`19`	`+__guess__ = ["xor-%d" % i for i in range(1, 256)]`
`20`	`20`
`21`	`21`
`22`	`22`	`def _xorn(text, n=1):`