Skip to content

Commit e0d9555

Browse files
s3inlcs3inlc
authored
fixed double quotes to single quotes to avoid issues with dollar sign in names (#1562)
1 parent 42f27d8 commit e0d9555

File tree

2 files changed

+109
-109
lines changed

2 files changed

+109
-109
lines changed

‎ci/files/update-hashes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def __init__(self, hashType, description, salted, slowHash):
5858
print('if (!isset($PRESENT["PLACEHOLDER"])){')
5959
print(" $hashTypes = [")
6060
for hashType in new_hashtypes:
61-
print(f' new HashType( {hashType.hashType}, "{hashType.description}", {int(hashType.salted)}, {int(hashType.slowHash)}),')
61+
print(f" new HashType( {hashType.hashType}, '{hashType.description}', {int(hashType.salted)}, {int(hashType.slowHash)}),")
6262
print(" ];")
6363
print(' foreach ($hashTypes as $hashtype) {')
6464
print(' $check = Factory::getHashTypeFactory()->get($hashtype->getId());')
@@ -74,4 +74,4 @@ def __init__(self, hashType, description, salted, slowHash):
7474
print(f" ({hashType.hashType}, '{hashType.description}', {int(hashType.salted)}, {int(hashType.slowHash)}),")
7575

7676

77-
print("Dont forgot to check if all hashtypes where salted = '1', are actually salted in a way that Hashtopolis understands!")
77+
print("Dont forgot to check if all hashtypes where salted = '1', are actually salted in a way that Hashtopolis understands!")

‎src/install/updates/update_v0.14.4_v0.14.5.php

Lines changed: 107 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -19,113 +19,113 @@
1919

2020
if (!isset($PRESENT["v0.14.4_update_hashtypes"])){
2121
$hashTypes = [
22-
new HashType( 1310, "sha224($pass.$salt)", 1, 0),
23-
new HashType( 1320, "sha224($salt.$pass)", 1, 0),
24-
new HashType( 2630, "md5(md5($pass.$salt))", 1, 0),
25-
new HashType( 3610, "md5(md5(md5($pass)).$salt)", 1, 0),
26-
new HashType( 3730, "md5($salt1.strtoupper(md5($salt2.$pass)))", 0, 0),
27-
new HashType( 4420, "md5(sha1($pass.$salt))", 1, 0),
28-
new HashType( 4430, "md5(sha1($salt.$pass))", 1, 0),
29-
new HashType( 5720, "Cisco-ISE Hashed Password (SHA256)", 0, 0),
30-
new HashType( 6050, "HMAC-RIPEMD160 (key = $pass)", 1, 0),
31-
new HashType( 6060, "HMAC-RIPEMD160 (key = $salt)", 1, 0),
32-
new HashType( 7350, "IPMI2 RAKP HMAC-MD5", 0, 0),
33-
new HashType( 8501, "AS/400 DES", 0, 0),
34-
new HashType( 10510, "PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40", 0, 1),
35-
new HashType( 12150, "Apache Shiro 1 SHA-512", 0, 1),
36-
new HashType( 14200, "RACF KDFAES", 0, 1),
37-
new HashType( 16501, "Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)", 0, 0),
38-
new HashType( 17020, "GPG (AES-128/AES-256 (SHA-512($pass)))", 0, 1),
39-
new HashType( 17030, "GPG (AES-128/AES-256 (SHA-256($pass)))", 0, 1),
40-
new HashType( 17040, "GPG (CAST5 (SHA-1($pass)))", 0, 1),
41-
new HashType( 19210, "QNX 7 /etc/shadow (SHA512)", 0, 1),
42-
new HashType( 20712, "RSA Security Analytics / NetWitness (sha256)", 1, 0),
43-
new HashType( 20730, "sha256(sha256($pass.$salt))", 1, 0),
44-
new HashType( 21310, "md5($salt1.sha1($salt2.$pass))", 1, 0),
45-
new HashType( 21900, "md5(md5(md5($pass.$salt1)).$salt2)", 0, 0),
46-
new HashType( 22800, "Simpla CMS - md5($salt.$pass.md5($pass))", 1, 0),
47-
new HashType( 24000, "BestCrypt v4 Volume Encryption", 0, 1),
48-
new HashType( 26610, "MetaMask Wallet (short hash, plaintext check)", 0, 1),
49-
new HashType( 29800, "Bisq .wallet (scrypt)", 0, 1),
50-
new HashType( 29910, "ENCsecurity Datavault (PBKDF2/no keychain)", 0, 1),
51-
new HashType( 29920, "ENCsecurity Datavault (PBKDF2/keychain)", 0, 1),
52-
new HashType( 29930, "ENCsecurity Datavault (MD5/no keychain)", 0, 1),
53-
new HashType( 29940, "ENCsecurity Datavault (MD5/keychain)", 0, 1),
54-
new HashType( 30420, "DANE RFC7929/RFC8162 SHA2-256", 0, 0),
55-
new HashType( 30500, "md5(md5($salt).md5(md5($pass)))", 1, 0),
56-
new HashType( 30600, "bcrypt(sha256($pass))", 0, 1),
57-
new HashType( 30601, "bcrypt(HMAC-SHA256($pass))", 0, 1),
58-
new HashType( 30700, "Anope IRC Services (enc_sha256)", 0, 0),
59-
new HashType( 30901, "Bitcoin raw private key (P2PKH), compressed", 0, 0),
60-
new HashType( 30902, "Bitcoin raw private key (P2PKH), uncompressed", 0, 0),
61-
new HashType( 30903, "Bitcoin raw private key (P2WPKH, Bech32), compressed", 0, 0),
62-
new HashType( 30904, "Bitcoin raw private key (P2WPKH, Bech32), uncompressed", 0, 0),
63-
new HashType( 30905, "Bitcoin raw private key (P2SH(P2WPKH)), compressed", 0, 0),
64-
new HashType( 30906, "Bitcoin raw private key (P2SH(P2WPKH)), uncompressed", 0, 0),
65-
new HashType( 31000, "BLAKE2s-256", 0, 0),
66-
new HashType( 31100, "ShangMi 3 (SM3)", 0, 0),
67-
new HashType( 31200, "Veeam VBK", 0, 1),
68-
new HashType( 31300, "MS SNTP", 0, 0),
69-
new HashType( 31400, "SecureCRT MasterPassphrase v2", 0, 0),
70-
new HashType( 31500, "Domain Cached Credentials (DCC), MS Cache (NT)", 1, 1),
71-
new HashType( 31600, "Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)", 0, 1),
72-
new HashType( 31700, "md5(md5(md5($pass).$salt1).$salt2)", 1, 0),
73-
new HashType( 31800, "1Password, mobilekeychain (1Password 8)", 0, 1),
74-
new HashType( 31900, "MetaMask Mobile Wallet", 0, 1),
75-
new HashType( 32000, "NetIQ SSPR (MD5)", 0, 1),
76-
new HashType( 32010, "NetIQ SSPR (SHA1)", 0, 1),
77-
new HashType( 32020, "NetIQ SSPR (SHA-1 with Salt)", 0, 1),
78-
new HashType( 32030, "NetIQ SSPR (SHA-256 with Salt)", 0, 1),
79-
new HashType( 32031, "Adobe AEM (SSPR, SHA-256 with Salt)", 0, 1),
80-
new HashType( 32040, "NetIQ SSPR (SHA-512 with Salt)", 0, 1),
81-
new HashType( 32041, "Adobe AEM (SSPR, SHA-512 with Salt)", 0, 1),
82-
new HashType( 32050, "NetIQ SSPR (PBKDF2WithHmacSHA1)", 0, 1),
83-
new HashType( 32060, "NetIQ SSPR (PBKDF2WithHmacSHA256)", 0, 1),
84-
new HashType( 32070, "NetIQ SSPR (PBKDF2WithHmacSHA512)", 0, 1),
85-
new HashType( 32100, "Kerberos 5, etype 17, AS-REP", 0, 1),
86-
new HashType( 32200, "Kerberos 5, etype 18, AS-REP", 0, 1),
87-
new HashType( 32300, "Empire CMS (Admin password)", 1, 0),
88-
new HashType( 32410, "sha512(sha512($pass).$salt)", 1, 0),
89-
new HashType( 32420, "sha512(sha512_bin($pass).$salt)", 1, 0),
90-
new HashType( 32500, "Dogechain.info Wallet", 0, 1),
91-
new HashType( 32600, "CubeCart (whirlpool($salt.$pass.$salt))", 1, 0),
92-
new HashType( 32700, "Kremlin Encrypt 3.0 w/NewDES", 0, 1),
93-
new HashType( 32800, "md5(sha1(md5($pass)))", 0, 0),
94-
new HashType( 32900, "PBKDF1-SHA1", 1, 1),
95-
new HashType( 33000, "md5($salt1.$pass.$salt2)", 1, 0),
96-
new HashType( 33100, "md5($salt.md5($pass).$salt)", 1, 0),
97-
new HashType( 33300, "HMAC-BLAKE2S (key = $pass)", 1, 0),
98-
new HashType( 33400, "mega.nz password-protected link (PBKDF2-HMAC-SHA512)", 0, 1),
99-
new HashType( 33500, "RC4 40-bit DropN", 0, 0),
100-
new HashType( 33501, "RC4 72-bit DropN", 0, 0),
101-
new HashType( 33502, "RC4 104-bit DropN", 0, 0),
102-
new HashType( 33600, "RIPEMD-320", 0, 0),
103-
new HashType( 33650, "HMAC-RIPEMD320 (key = $pass)", 1, 0),
104-
new HashType( 33660, "HMAC-RIPEMD320 (key = $salt)", 1, 0),
105-
new HashType( 33700, "Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)", 0, 1),
106-
new HashType( 33800, "WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]", 0, 1),
107-
new HashType( 33900, "Citrix NetScaler (PBKDF2-HMAC-SHA256)", 0, 1),
108-
new HashType( 34000, "Argon2", 0, 1),
109-
new HashType( 34100, "LUKS v2 argon2 + SHA-256 + AES", 0, 1),
110-
new HashType( 34200, "MurmurHash64A", 1, 0),
111-
new HashType( 34201, "MurmurHash64A (zero seed)", 0, 0),
112-
new HashType( 34211, "MurmurHash64A truncated (zero seed)", 0, 0),
113-
new HashType( 34300, "KeePass (KDBX v4)", 0, 1),
114-
new HashType( 34400, "sha224(sha224($pass))", 0, 0),
115-
new HashType( 34500, "sha224(sha1($pass))", 0, 0),
116-
new HashType( 34600, "MD6 (256)", 0, 0),
117-
new HashType( 34700, "Blockchain, My Wallet, Legacy Wallets", 0, 0),
118-
new HashType( 34800, "BLAKE2b-256", 0, 0),
119-
new HashType( 34810, "BLAKE2b-256($pass.$salt)", 1, 0),
120-
new HashType( 34820, "BLAKE2b-256($salt.$pass)", 1, 0),
121-
new HashType( 35000, "SAP CODVN H (PWDSALTEDHASH) isSHA512", 1, 1),
122-
new HashType( 35100, "sm3crypt $sm3$, SM3 (Unix)", 1, 1),
123-
new HashType( 35200, "AS/400 SSHA1", 1, 0),
124-
new HashType( 70000, "Argon2id [Bridged: reference implementation + tunings]", 0, 1),
125-
new HashType( 70100, "scrypt [Bridged: Scrypt-Jane SMix]", 0, 1),
126-
new HashType( 70200, "scrypt [Bridged: Scrypt-Yescrypt]", 0, 1),
127-
new HashType( 72000, "Generic Hash [Bridged: Python Interpreter free-threading]", 0, 1),
128-
new HashType( 73000, "Generic Hash [Bridged: Python Interpreter with GIL]", 0, 1),
22+
new HashType( 1310, 'sha224($pass.$salt)', 1, 0),
23+
new HashType( 1320, 'sha224($salt.$pass)', 1, 0),
24+
new HashType( 2630, 'md5(md5($pass.$salt))', 1, 0),
25+
new HashType( 3610, 'md5(md5(md5($pass)).$salt)', 1, 0),
26+
new HashType( 3730, 'md5($salt1.strtoupper(md5($salt2.$pass)))', 0, 0),
27+
new HashType( 4420, 'md5(sha1($pass.$salt))', 1, 0),
28+
new HashType( 4430, 'md5(sha1($salt.$pass))', 1, 0),
29+
new HashType( 5720, 'Cisco-ISE Hashed Password (SHA256)', 0, 0),
30+
new HashType( 6050, 'HMAC-RIPEMD160 (key = $pass)', 1, 0),
31+
new HashType( 6060, 'HMAC-RIPEMD160 (key = $salt)', 1, 0),
32+
new HashType( 7350, 'IPMI2 RAKP HMAC-MD5', 0, 0),
33+
new HashType( 8501, 'AS/400 DES', 0, 0),
34+
new HashType( 10510, 'PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40', 0, 1),
35+
new HashType( 12150, 'Apache Shiro 1 SHA-512', 0, 1),
36+
new HashType( 14200, 'RACF KDFAES', 0, 1),
37+
new HashType( 16501, 'Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)', 0, 0),
38+
new HashType( 17020, 'GPG (AES-128/AES-256 (SHA-512($pass)))', 0, 1),
39+
new HashType( 17030, 'GPG (AES-128/AES-256 (SHA-256($pass)))', 0, 1),
40+
new HashType( 17040, 'GPG (CAST5 (SHA-1($pass)))', 0, 1),
41+
new HashType( 19210, 'QNX 7 /etc/shadow (SHA512)', 0, 1),
42+
new HashType( 20712, 'RSA Security Analytics / NetWitness (sha256)', 1, 0),
43+
new HashType( 20730, 'sha256(sha256($pass.$salt))', 1, 0),
44+
new HashType( 21310, 'md5($salt1.sha1($salt2.$pass))', 1, 0),
45+
new HashType( 21900, 'md5(md5(md5($pass.$salt1)).$salt2)', 0, 0),
46+
new HashType( 22800, 'Simpla CMS - md5($salt.$pass.md5($pass))', 1, 0),
47+
new HashType( 24000, 'BestCrypt v4 Volume Encryption', 0, 1),
48+
new HashType( 26610, 'MetaMask Wallet (short hash, plaintext check)', 0, 1),
49+
new HashType( 29800, 'Bisq .wallet (scrypt)', 0, 1),
50+
new HashType( 29910, 'ENCsecurity Datavault (PBKDF2/no keychain)', 0, 1),
51+
new HashType( 29920, 'ENCsecurity Datavault (PBKDF2/keychain)', 0, 1),
52+
new HashType( 29930, 'ENCsecurity Datavault (MD5/no keychain)', 0, 1),
53+
new HashType( 29940, 'ENCsecurity Datavault (MD5/keychain)', 0, 1),
54+
new HashType( 30420, 'DANE RFC7929/RFC8162 SHA2-256', 0, 0),
55+
new HashType( 30500, 'md5(md5($salt).md5(md5($pass)))', 1, 0),
56+
new HashType( 30600, 'bcrypt(sha256($pass))', 0, 1),
57+
new HashType( 30601, 'bcrypt(HMAC-SHA256($pass))', 0, 1),
58+
new HashType( 30700, 'Anope IRC Services (enc_sha256)', 0, 0),
59+
new HashType( 30901, 'Bitcoin raw private key (P2PKH), compressed', 0, 0),
60+
new HashType( 30902, 'Bitcoin raw private key (P2PKH), uncompressed', 0, 0),
61+
new HashType( 30903, 'Bitcoin raw private key (P2WPKH, Bech32), compressed', 0, 0),
62+
new HashType( 30904, 'Bitcoin raw private key (P2WPKH, Bech32), uncompressed', 0, 0),
63+
new HashType( 30905, 'Bitcoin raw private key (P2SH(P2WPKH)), compressed', 0, 0),
64+
new HashType( 30906, 'Bitcoin raw private key (P2SH(P2WPKH)), uncompressed', 0, 0),
65+
new HashType( 31000, 'BLAKE2s-256', 0, 0),
66+
new HashType( 31100, 'ShangMi 3 (SM3)', 0, 0),
67+
new HashType( 31200, 'Veeam VBK', 0, 1),
68+
new HashType( 31300, 'MS SNTP', 0, 0),
69+
new HashType( 31400, 'SecureCRT MasterPassphrase v2', 0, 0),
70+
new HashType( 31500, 'Domain Cached Credentials (DCC), MS Cache (NT)', 1, 1),
71+
new HashType( 31600, 'Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)', 0, 1),
72+
new HashType( 31700, 'md5(md5(md5($pass).$salt1).$salt2)', 1, 0),
73+
new HashType( 31800, '1Password, mobilekeychain (1Password 8)', 0, 1),
74+
new HashType( 31900, 'MetaMask Mobile Wallet', 0, 1),
75+
new HashType( 32000, 'NetIQ SSPR (MD5)', 0, 1),
76+
new HashType( 32010, 'NetIQ SSPR (SHA1)', 0, 1),
77+
new HashType( 32020, 'NetIQ SSPR (SHA-1 with Salt)', 0, 1),
78+
new HashType( 32030, 'NetIQ SSPR (SHA-256 with Salt)', 0, 1),
79+
new HashType( 32031, 'Adobe AEM (SSPR, SHA-256 with Salt)', 0, 1),
80+
new HashType( 32040, 'NetIQ SSPR (SHA-512 with Salt)', 0, 1),
81+
new HashType( 32041, 'Adobe AEM (SSPR, SHA-512 with Salt)', 0, 1),
82+
new HashType( 32050, 'NetIQ SSPR (PBKDF2WithHmacSHA1)', 0, 1),
83+
new HashType( 32060, 'NetIQ SSPR (PBKDF2WithHmacSHA256)', 0, 1),
84+
new HashType( 32070, 'NetIQ SSPR (PBKDF2WithHmacSHA512)', 0, 1),
85+
new HashType( 32100, 'Kerberos 5, etype 17, AS-REP', 0, 1),
86+
new HashType( 32200, 'Kerberos 5, etype 18, AS-REP', 0, 1),
87+
new HashType( 32300, 'Empire CMS (Admin password)', 1, 0),
88+
new HashType( 32410, 'sha512(sha512($pass).$salt)', 1, 0),
89+
new HashType( 32420, 'sha512(sha512_bin($pass).$salt)', 1, 0),
90+
new HashType( 32500, 'Dogechain.info Wallet', 0, 1),
91+
new HashType( 32600, 'CubeCart (whirlpool($salt.$pass.$salt))', 1, 0),
92+
new HashType( 32700, 'Kremlin Encrypt 3.0 w/NewDES', 0, 1),
93+
new HashType( 32800, 'md5(sha1(md5($pass)))', 0, 0),
94+
new HashType( 32900, 'PBKDF1-SHA1', 1, 1),
95+
new HashType( 33000, 'md5($salt1.$pass.$salt2)', 1, 0),
96+
new HashType( 33100, 'md5($salt.md5($pass).$salt)', 1, 0),
97+
new HashType( 33300, 'HMAC-BLAKE2S (key = $pass)', 1, 0),
98+
new HashType( 33400, 'mega.nz password-protected link (PBKDF2-HMAC-SHA512)', 0, 1),
99+
new HashType( 33500, 'RC4 40-bit DropN', 0, 0),
100+
new HashType( 33501, 'RC4 72-bit DropN', 0, 0),
101+
new HashType( 33502, 'RC4 104-bit DropN', 0, 0),
102+
new HashType( 33600, 'RIPEMD-320', 0, 0),
103+
new HashType( 33650, 'HMAC-RIPEMD320 (key = $pass)', 1, 0),
104+
new HashType( 33660, 'HMAC-RIPEMD320 (key = $salt)', 1, 0),
105+
new HashType( 33700, 'Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)', 0, 1),
106+
new HashType( 33800, 'WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]', 0, 1),
107+
new HashType( 33900, 'Citrix NetScaler (PBKDF2-HMAC-SHA256)', 0, 1),
108+
new HashType( 34000, 'Argon2', 0, 1),
109+
new HashType( 34100, 'LUKS v2 argon2 + SHA-256 + AES', 0, 1),
110+
new HashType( 34200, 'MurmurHash64A', 1, 0),
111+
new HashType( 34201, 'MurmurHash64A (zero seed)', 0, 0),
112+
new HashType( 34211, 'MurmurHash64A truncated (zero seed)', 0, 0),
113+
new HashType( 34300, 'KeePass (KDBX v4)', 0, 1),
114+
new HashType( 34400, 'sha224(sha224($pass))', 0, 0),
115+
new HashType( 34500, 'sha224(sha1($pass))', 0, 0),
116+
new HashType( 34600, 'MD6 (256)', 0, 0),
117+
new HashType( 34700, 'Blockchain, My Wallet, Legacy Wallets', 0, 0),
118+
new HashType( 34800, 'BLAKE2b-256', 0, 0),
119+
new HashType( 34810, 'BLAKE2b-256($pass.$salt)', 1, 0),
120+
new HashType( 34820, 'BLAKE2b-256($salt.$pass)', 1, 0),
121+
new HashType( 35000, 'SAP CODVN H (PWDSALTEDHASH) isSHA512', 1, 1),
122+
new HashType( 35100, 'sm3crypt $sm3$, SM3 (Unix)', 1, 1),
123+
new HashType( 35200, 'AS/400 SSHA1', 1, 0),
124+
new HashType( 70000, 'Argon2id [Bridged: reference implementation + tunings]', 0, 1),
125+
new HashType( 70100, 'scrypt [Bridged: Scrypt-Jane SMix]', 0, 1),
126+
new HashType( 70200, 'scrypt [Bridged: Scrypt-Yescrypt]', 0, 1),
127+
new HashType( 72000, 'Generic Hash [Bridged: Python Interpreter free-threading]', 0, 1),
128+
new HashType( 73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 0, 1),
129129
];
130130
foreach ($hashTypes as $hashtype) {
131131
$check = Factory::getHashTypeFactory()->get($hashtype->getId());

0 commit comments

Comments
 (0)