Merge pull request #287 from vin01/master

asottile · web-flow · commit 7a8a6e4b5473 · 2018-05-18T15:41:06.000-07:00
Detect putty &amp; sshcom private keys
diff --git a/pre_commit_hooks/detect_private_key.py b/pre_commit_hooks/detect_private_key.py
@@ -9,6 +9,8 @@
     b'BEGIN EC PRIVATE KEY',
     b'BEGIN OPENSSH PRIVATE KEY',
     b'BEGIN PRIVATE KEY',
+    b'PuTTY-User-Key-File-2',
+    b'BEGIN SSH2 ENCRYPTED PRIVATE KEY',
 ]
 
 
diff --git a/tests/detect_private_key_test.py b/tests/detect_private_key_test.py
@@ -8,6 +8,8 @@
     (b'-----BEGIN DSA PRIVATE KEY-----', 1),
     (b'-----BEGIN EC PRIVATE KEY-----', 1),
     (b'-----BEGIN OPENSSH PRIVATE KEY-----', 1),
+    (b'PuTTY-User-Key-File-2: ssh-rsa', 1),
+    (b'---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----', 1),
     (b'ssh-rsa DATA', 0),
     (b'ssh-dsa DATA', 0),
     # Some arbitrary binary data

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`b'BEGIN EC PRIVATE KEY',`
`10`	`10`	`b'BEGIN OPENSSH PRIVATE KEY',`
`11`	`11`	`b'BEGIN PRIVATE KEY',`
	`12`	`+ b'PuTTY-User-Key-File-2',`
	`13`	`+ b'BEGIN SSH2 ENCRYPTED PRIVATE KEY',`
`12`	`14`	`]`
`13`	`15`
`14`	`16`