Skip to content

Commit f129d18

Browse files
committed
openssh: Fix Regexp for large key size
1 parent 6dacd5e commit f129d18

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

data/prototypes.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5927,7 +5927,7 @@
59275927
]
59285928
},
59295929
{
5930-
"regex": "\\A(?:.+:)?\\$sshng\\$6\\$\\d{1,2}\\$[a-f0-9]{16,32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}(?:\\$\\d{1,2}\\$\\d{1,3})?\\Z",
5930+
"regex": "\\A(?:.+:)?\\$sshng\\$6\\$\\d{1,2}\\$[a-f0-9]{16,32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}(?:\\$\\d{1,2}\\$\\d+)?\\Z",
59315931
"modes": [
59325932
{
59335933
"john": "ssh",
@@ -5936,7 +5936,8 @@
59365936
"name": "OpenSSH private key (RSA/DSA/EC + Bcrypt PBKDF + AES-256-CTR)",
59375937
"samples": [
59385938
"$sshng$6$8$7620048997557487$1224$13517a1204dc69528c474ef5cbb02d548698771f2a607c04ea54eb92f13dedba0f2185d2884b4db0c95ce6432856108ea2db858be443e0f8004ffcd60857e4ff1e42b17f056998ec5f96806a06e39cc6e6d7ef4ce8ae62b57b2ec0d0236c35cf4bc00dd6fda45e4788dcca0f0e44dddae1dad2d6e7b705d076f2f8fc5837eec4a002d9633bcad1f395ca8e85e78459abe293451567494d440c3f087bb7fe4d6588018f92ca327dda514a99d7b4b32434da0e3b1bf9344afb2fe29f8d8315a385fe8b81fd4c202c7d82cd9f0bb1600e59762ab6ea1b42e4e299f0a59ce510767e1e1138453d362d0a1aa6680e86b5aa0bd5c62165f4fe7c2867f9533578085adc36739d6c9cf7b36899aac39dcabac8b39194433423e8e18ba28496bbe14dd01231eb5b091ae9de0f7f9ea714c22edac394077fb758fe496e1880571ade399ac229457ddd98577f8a01a036ad3bc8b03a9fb02e26b4b76f6cb676eabe82d1606fca0c5fca62cd1d82c3df1ed58ab4acd4611b2827ebde722bc05e471a427225818aa36dabf5bf1203ccb0ebc8dec097e49f7f948bfe7b939e6d0ff1125b863c033768f588964f8b77ca1e2425751f873f80e5d6a0671f7860cf4a46533585094726c3afe5f7203fa4a01650fa9839772c713a033139cfc6a6e6f7dc62e5844d4c57ef4fc3321bc85d597a54bd6fe37e9e696cf3b5ec66f55232e0964dc5cf880d8a41a9891150618bd9c088fd9824af0d86f817f2c79429c3d56cd6eb41eb6120f9accc10a863f23a2bb6c57d4bd6193f2283ae0215e2e87e672a8438e2550c044fa9556bdb4afc40d8c2752ffbc6c95571756a3c230bb2fa95f519f8da238ef0857ecf860247a8b26e28269f9bad564e7d8bfba2eac9760b52449251cb35e183f5b309a09071535154c6f1013b58f305b544f3589c9eb0e9ac4267a84374a3eab49c53aa9bedbf97f8f19ebc212d8db74ee03554a3514140667fa4ce8e06aad3f32d1b00015be0e8979fe66736018589beee06d6f318851dbe8d9689e70202185d71fc5e5a3d2996ddb8ae1d7718c49855c6f8c43301e0915f324f30d0d9c6a8504a91ad5a7179aafb87ede58598394949910874850994abe815817359152ff6a7c8cc6f19524dfc5e50ddfd038a2275bf809e3c8f05ed3e3137ebd62d91cd3578533787c3847e3c5e07e5a891480e5ceabcf6c344e7bec8b640ab9a03e90b846b35d2f46ba150accef32d2597b064810b15fd54fca6d2b146feabcd05c0b51617ae95e36f6817a62c3ff42c5c2f6f1d20a8a1fd334d3b7d3f83bba057b79d9b5508bb0cb706ba00acb0ab797401fdcfac80b5b6e38e51aec0b38f33ff4690425ca28d88a2e876591521230150b4e20a4a82e50061cee9c0705100bfe5fdbd8ef27aec20387cf32455ef305bce2a91ae6da91fc41376b97149e9b41c901b24811df9272ff09718923b8d94e8e459a164a22b0eca47653f3efcbf08188c5da78cd9fb9eda1761094f9d8bc3d479e9f40c7d79ebaaba2a5c632329f20a9962040ff8f512b42c5f32a8460d87b8e93c6f980a1562c436eea1c8994fbf671dda3c4ccd3c142acfcdde2ab61227289ad408213ac8e22d9ef487f36925f5ba3b8e7e913d25c4a8592c861d13f03b615bc2760aabc61d68db80d35296a3312fdf4b56c0fbee5ab3fea1cf9caf3960a564046939e8002d2dd909db446d85aeae9dd42a33fe28684f722172e6",
5939-
"id_ed25519:$sshng$6$16$7aaacd96f5d90b595e95ec0b1ff64fa4$274$6f70656e7373682d6b65792d7631000000000a6165733235362d6374720000000662637279707400000018000000107aaacd96f5d90b595e95ec0b1ff64fa40000001800000001000000330000000b7373682d6564323535313900000020c55d041c041604ff871be853bfec2d62654416bfc01593531251157ade20ff5500000090cf59137eee3fca657818cde5c17b09e005da8abf6c856f89f27d03d3208ff1bcc9ea18054d8b1f0c13fd5d5bb7cb850f256f5578cb4f194f7b4f9a7517a78c26cc549f9cebc7026d43abf47e359caa9cf2e01adbfc5284d74bf728099780accd600fcdfd7d7aa60050698820be8564eb717379bfc618ec6f69d8d6d09670a5e9999b4dd4e1921921bf356c58e0af06ff$24$130"
5939+
"id_ed25519:$sshng$6$16$7aaacd96f5d90b595e95ec0b1ff64fa4$274$6f70656e7373682d6b65792d7631000000000a6165733235362d6374720000000662637279707400000018000000107aaacd96f5d90b595e95ec0b1ff64fa40000001800000001000000330000000b7373682d6564323535313900000020c55d041c041604ff871be853bfec2d62654416bfc01593531251157ade20ff5500000090cf59137eee3fca657818cde5c17b09e005da8abf6c856f89f27d03d3208ff1bcc9ea18054d8b1f0c13fd5d5bb7cb850f256f5578cb4f194f7b4f9a7517a78c26cc549f9cebc7026d43abf47e359caa9cf2e01adbfc5284d74bf728099780accd600fcdfd7d7aa60050698820be8564eb717379bfc618ec6f69d8d6d09670a5e9999b4dd4e1921921bf356c58e0af06ff$24$130",
5940+
"$sshng$6$16$c26644e92fdea90db2eaf7662b4bac6c$4730$6f70656e7373682d6b65792d7631000000000a6165733235362d637472000000066263727970740000001800000010c26644e92fdea90db2eaf7662b4bac6c00000018000000010000040b000000077373682d72736100000003010001000003f500c806d8b02f84d7ebb364b7ffc0ad621a8bfc02f566ce980b0941b7a50d468a3808cba9e7dd36c97848ce0cecb7427df5187c59c305416b43897692c5592361683e864363d14f163e4eac2da7daf5483b7cef894a27d469e7ff8547d9191cb99211854603c2f28db48a3dc46d3e5eccd7584756934a2465ba551a5766eaf3e7ccb1fd4e529b42f09cf9dc2d506b28fb314442fa8d3d94682cbdca8be9b0765399008955a79fd82ed804c71db2b6a8b502ecfdf5d22cf60b819bd748b1872a0294c0edcd050d7d4e1199f26aafbe122ad66f5364911d8896be623f4bbe7b1535f92c933a529e35e38b6bed78ccc371aab9e4a8c7d626ca51bac3321df5fc103639ac0afabf4c287a6bdc8ba11a3f0792a74ddc0b409af2836884f6f085558f67b6f2e685bdf21ff4fa9b2b67a90115fb31a60ca2787e9030d428265ca3c6b4a21999206fbfb6fa5fe203722043d04694b9dd5d1a0e21de127d0b0aa4ca945f39677f4a20674c0c931086d918dfbbc99afebaad439b81a777ae65093753153623ca2245c685e5a5bfd2f978a61f7ecef9054dd6ab2aea283bdc76f26caee7b56e4f98aa74fd32ae2e1eb786fddb863a668e0678cea284621108f282f5b09aee513d5777b4c1d536e1b3d095cdc89d0a78759607be132bdb84b1467525852c0ff825597f7ecaffb7b0071037f106609f7e00c6af64d51e51eaa4773762212d695e002578bdc06955e138baf78762a97dba8e6d81d0e51d7e5be6782b7d7cc603f45c23d93a702de88a3f6326293f35ba529657acded4a2ce496e6b4113f08f871b09b84b1d6bf001ba59cfe9662614ed1a775bc8b784b56cc49dbf9a9b21be24e99676f9b288cb0633e406d0c47469f9ecaeb02884bdc615c8235c2e36a6e0667a844f5a7bf7cbddd264391dd0278585207d04ae514d689d141c95bfaebdfa25252c3deaf59070e2122d3a3805f6e60f9186eacc8bbf1a4624005f95a7397fc795e2cc75f69644a21bbe751234746490f54d401e30d6bc5940fbc6b5823d89cff3a921d2efa90febdf4dd22c91db4dbbd178b844a2274d321498d2d92687223dc5ff8bc614e1f4c7628e79467ed36533c5ce77f295e868be1d4dbdadd2faa2d7a560571650b3b1f2eed7091b2ab7a9ec7ca0e642e777c1ec4d52590f541a0898262031b0906934a1d5e109d5f678b6a0bfba74dbe271e81c1e355c9200886a894f8c9b02233d44ce4c92351a2f3cb68caab8e0df30bd89f3d5d32b72c0fe6cb25c584317e922ed26d592cebd39aa4f0ed4bf29c802125427bcbf20a7543128b692cc7f01ee6ba9270b74ed44b331c9130901f1eb0a76650cfbf238fd124abf4f77afef9bc0396048e341633b082b4786c27cc221c0844cc564ddbc9a35f4921eaefd30ce32af9e0bd92677725e53f73962e40062671300000e2088854d5c9989180c9babd5a54e8f78b2914fe70f866e501b2a322ca0b90ac6ad2d54c169818cd27643503a97612c93d016d2614f427d4d9b4e6d7da4ee90796fc397511b912a7d9191ae016bf91e8de48e8c597ad366ef827df3ac06cc7e6d9e27ee3040e481c39507daddda3a0fa0002f6baa6f79a368ccab73a55707f41ffb26664f464fb67df24a54f25046b497f70aaf5e42c435ecc9eaeb8bcbf362659f2f5c8c389a8dd16f3c40b5d1a902d2a83f354a2b1ea0ef7cfb1bc25056bcdb34c065a9fa6b741057fc8bd4432ab80f4f8c7f16f5a9629c712e12c36063f71a664da781061145e2539011a9acded5da9635094e26a968eae89e46e182dc3bb9ed2a9644b19b8d716a1d123a5b3633d53f2ab2c741c49b04ab230b9f883c7a70e850717f13fec82c5e345870e346b24a8f97dfed80308ea9fcb5016690431f63a8aeff2f16b9555182e9c7a6a8c9d29c48e54c68aab26dc023b98a4186a3ee198209304f75fdde6b65aec2ca10a9652765fd806eefac82239f33fbadef300df9e3ea20288c94cc95b87595ca2ce36569ff8e80e0617d5c94e3c3b480ba97e2c225f115830979a7a093f7ded960cce020b08e8fca2073df8dfba47101932ef0e3f1d36019917fdba02aef1318c2c95e98de36b4669c370b57a0cf03a3977e146a34b4a8fa12e62df59ccb7fead8cec301c6508685651aa1ffd2da67abbb4a8cf4671d5af821a76e8427b19f8116cf9c3e2af53aef7250b7ccfaed0433c7d5c0c95bf6982587705a19a2a152948eef60e0f1e1c5c4d1845ae2bafd00d8e041c77c0a8eca43b2b3e5cef1ceee2e8e2e5eb442ace8a314b0bf04b7388cd495374bfe2c1d9d540bb7ce41894b6e3fe3e5fd81628c640d78c2fb73ad67b01c131e5da5b0d3bb8bb8828f5750943811f96b25b8fc08db5296b44ef7d15da180862db98843ed2f0cd6f8131668e23604b2bff1689ae3aaac223764b0b09dd672d01b97c885eea5408c3669be10280c0df06200a91bd084df829abbab2164de8abc3ba539a5ede40622432611032fc966d266631a6e7cc1ab9d346368e6d2cf1b2de5693355f6f77d5cf26e2a62bfc2ac45c18d338a01bc69ab23cd0f274fe322517fc4170c9b5d5dae0e68e9c4289ce5530a0dbcd471cf0a9ef325653f400bc287e5b7ba2136e3c0cbff61cb58055db9479ecd362093f6ac69e854946c8557af8de6d938b6caf19af3b05f8dc22f2721cf329f30e3c3cd7b90b58395324a0f11978ca31b213f8aca5c4ecfc9a1c8652c2469b8a78136b41e1f76ef5d271b67ac3d346b2d169d8dd0ef7ab26d6277ba47b0546f07599a92b2f94b8a6db50eb5d9b722eab8203bb08cf10a604b9b37b5cc0cdb83ebc43b3a866402f947b63e57f0519a749c3d993d874d662a10a1358b67332be5e5b5b938550aae99152cacc026df8794bc2e681e7e1470216520a51df69ae605a91e67e130b3dd315d390f20d86d0585e1717f419a6448e52f072d556e95fa998f297429bbb6eb8b04670234e34905d145ee456e02e86b6e008b2f04825248d16080f08ce8e3081d0c03d88331c0a4c6de650cd2ddc6141383ff28be7e4d077d0faf9aa7018bfa5f52fc48419f948189989cb87f92ecfb285db3b16a5a6941ee5a1b9aa2365eaa647903a88212621a39c5f10d3ebc75bf8ed0ce596de02d7fb3f93e67fc6d18b5124453cb468966a33ab3002bbcbc274ed2466e4d476720a1b4006329ccd12356cff654a1441f0b2d6d711214c5c4a03751fdcc4a20dac1dc91f9981ac7f2392840fe1e706cf33780ec1b8ee9c1854be2ca3bc89728ea4ec0a2440f95a2313e2512808fe7c89dbb4036b243a9aac8e07d50772c090555eb919972e86d4dececc66931f2df2f5ff73604391db4e04b183ceaaa3c992d319ca0806f59dd067f044d1fc6a1ecc89d0263c9ae3c2b361e5ae39bcc2d02d1ec966368646d9bd85b0a447a8f4235395af589dc19c57a7021d54d1fefb97dffdb534d1c9028f7bae41994480c55ec91e79015fcdc2587ff1d22a63c48d9d44eee4eb2356b8c9a183b0c65bf35fddbe4ee668a71480e1f6d92dad0266fda7e90b06d87e8301122b91f75d917db0124af75da0d859fb3e1b15d81e4c62cd92ae09d4804c2768e4f86adbedb45131b81fefdcace21b4dab7656ad8747f53f2b8abf994edb8497d27d9cdf320f15a7b55e0488bd157f4f5275b443468c77beddf414965f977b9ddb2ff42baa544f62e1e707744e91226830764e59dafdd6280a032c8585b441c6c245f84ff8d94e9ff6abb67ae11cc3736d85aeae8d04e95b5defb0a1048fffd0eff1d5182a704b7e806561b300325296fb53353d6950a8fc8d80377e0e68398dda2dba8ccaa285c60b8c2e066dbcd68b4b852bdb72e3a0a708cbc92a2a645345fe1882f71853a68c6cc81b82d9e4ad76317aa679479c81f26f6d3c665c49c6142872a72c0e6a0f5a0297eb96229ed5b26420de64ef86e4b5842505fc3ed55e0cab16bad04ed66f664056218c45ed971ae732f1747fcfd020edaeeff0d1a033c45258b577c9ab5dede4585b7be85f27e25a86818d10f1135863cdf137e0a0513b05bd4bd75462b46419dc81202bcdc5c86c268718b405915c1e0b6df974a16ce59cf2bccb81eff83e87becf1894aa6ca06a807b8be38b8cbd15bb70cbb6e81ebb0fe9bb87f6977f8a00ebc13ad0156d8b554e1d22c8c3f4038faeca3d3d8ad26c3c643133ce00c7d99dc755d82bf85987c1b52c16a29bcaa0d699035494846b9481bfcc91bf029e3d1b4f11254a7f6e46e2984c7b0e61dd446afb675004f5d5e31abf5ea53824096ad29cea40f62722f7c66acca38fa96ba2474509aaba29e9c03d6554062f3cb386d43ec4d345012c2cec03f7acfacef3108f9cdb430853c174e3cfd1d0a97f042ded010c0b774db994461a44849579534c80fcfccd5c497ebc2fe2159532d08169b2f8a19a33411f963344d4c6189b135f6545cff20b15a13fa49852f363fd9ef1ae93cd018354100142f5c6094e69b10efca389b71b8a6a6914753fa4c2c0926b851bfd9b339a1499b0a7eeef0bcffc65e8a10464105f8d7f793032e8377151ed7c847e52804f78475da5c95ebae94eef9e39dc2744ef89a5bba6c87a9b3fc96b8c10ace00d8bacf96f494eea5e6b8640ab3cfe1ac8161aec332416f08251e85ace169fc106c24826d1805f56ef6bb353c0c9a14e9869cd0cb366eb64a87ee37f58291f862c4a6e8742146553d28d5e7e6106297b8c3edc1c08a0cae6b27bbbace84062b3e59c8b37fa3df2fac17044b39c248595b91d0262037557f27c9deebeab1c1fe4acd5a3b764c6d4676c74b9e005e121b859a563d89f022483588bfd10b7c22de538c3f85219cd329c42dc23fa787d07d310625a774f29b474b81a3eb2604ce5a26b1c015d1342d5f1aa4d9295fc5d9f80cead3d67d5cc300117a3fdd7466dd7c09298f605730412de34ed77550af0313709e2b159bbc1f241d821c8842e44cc13d18d23ea0c24f66b206c9fd12147f50a95f5ade73690c9b7517925555fee96b53d5bd2dd137e5670d76bd15b1aeae1737c9903ac03789d347b61c4db113849e4b164670f39496fd1b92644409bcbb4213d3aadb032791851501643dc27f032ba4ef88f8d36e439330c4fefe65eb2304c351564e02c81e54ad90d5cb9aad8f3a35837ce3547233dee3742a0a9a86370664bf0e925c618709ab51d3141267642ed3095c4e939b1060a6bd0f18216957977967aa2bb0706d7f579828548ed238eec56c224f4883148f6f1b1ffc8a61ea10012e18e0f7f3f16a9177799fe365c301d6a8421e8e4d583a6f7c0b4791300d7537d1deef9272810a1ede18139659404149cdbe93f156c597ba2f0ef27769f2ba1eb784d7a22687e3fe860fcfd49cd134fdfbae3cc63330fb2cede41ec15a410551fd47190e4f7882d08a2b378b4e57209a6774654bdbf0275374140c4c5fe9ee019e8422c0606bbd7eea7b9682ac1713970826e0a7f285cf970610543298bfdc901818994d282e8132c5c0373959579beb71c25b5ad7181c9d712c08ad189c476798d3a345d786c2f97eb36863cbe39f4f033732513a2243a2b53fae85987d5134b5362bdc07555173fd80259b06916420727fe53ef78cc79a2a70c4a3b3cf68bf7116fee56cea9005b212c638463fa7115598cbaf56aff2df7d65d5268d4200e3c0f2ba086fd465cf24afe3a903dc4403ae2d920090f05b7954a0267ac483a2f6e28325a80f4fe69d7c36e3ab8816765e46632c86e7a7e568a95514371f4bced7ab3907607fda6218c424d6b93fb0ffaf36959bcb7b6abbee2acfb5bb3ff5e6468c5bf4ac69ee03932d67b24fce5d98c9f807788da3047c2106373775ef4422e22c5d86c9bcccda0c80e3e5fdcccb8478197a95b32b1210e06746f0afb189ccdf4786757969097bfb60ce5f5c3d7e1e0741129b9318fabdb31bdce6b5e98d21ae4bb2d70e818acfb94528264a335044a3c5a3e2888bec3478d9b6221e648d4b658498b69499f2474abfd10d42a11bd1ae8848798c473f3456eb1c619c3a20d5dc4feb0cf07797c2f45efff0cde070228f7372ae416144353468cc2925e1f8c9f7c2f0766ea85f7e57dc01414e9bb1c6992a291feafa967f0d76f7b6ed320f560a777376a7f623af260228f876f5ae519d7a853a66b73230870215f51a58c9fcbbb268f2904b8a7ffad3b7eecb068fee53c714be48a26683c06280dd7c9a5d1d26515cf34a543a88184625f64ea92fb999fcfc3d05778faddf956c8be75c73f8dfd07a096bf98bf713b14fcd949192e97048067c7c96a56d78f6bcb7da9c32898e83214426f2aac1a8da5ff06d4b12f8b5de1faa639852a1702a87d6db1df11ed39697e74578632146988625cb69923e3f23078b2781a5c96c1086b8e926e0f748ca337fc2b541771dd3f7d2c73f5d8493b4c9566c2babd7e5f5c2095749c8b4fe85e3bc62d692651ef1d8ff69e6c79ff4647f414016bb48c015a70e3ea4a463205de87d0013114835265b8215f40bfc4bc99afd7c4ee8884229bc879aaa1669751a260517d685c446b61371cb6a6e089f1d812ff6$24$1114"
59405941
]
59415942
}
59425943
]
@@ -5998,7 +5999,7 @@
59985999
]
59996000
},
60006001
{
6001-
"regex": "\\A(?:.+:)?\\$sshng\\$2\\$\\d{1,2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}(?:\\$\\d{1,2}\\$\\d{1,3})?\\Z",
6002+
"regex": "\\A(?:.+:)?\\$sshng\\$2\\$\\d{1,2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}(?:\\$\\d{1,2}\\$\\d+)?\\Z",
60026003
"modes": [
60036004
{
60046005
"john": "ssh",

docs/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
## [unreleased]
22

3+
- **Enhancements**:
4+
- OpenSSH private key
5+
- Fix Regexp for large key size (reported by [lap1nou][lap1nou] on [#217][#217])
6+
7+
[#217]:https://github.com/noraj/haiti/pull/217
8+
[lap1nou]:https://github.com/lap1nou
9+
310
## [3.0.0]
411

512
- **Breaking changes**:

0 commit comments

Comments
 (0)