Fix merge conflict

Discovery/Web_Content/AdobeCQ-AEM.txt

@@ -0,0 +1,73 @@
+/libs/granite/core/content/login.html
+/libs/cq/core/content/login.html
+/crx/explorer/index.jsp
+/crx/packmgr/index.jsp
+/bin/querybuilder.json?type=rep:User&p.hits=selective&p.properties=rep:principalName%20rep:password&p.limit=100
+/.json
+/.tidy.6.json
+/.tidy.infinity.json
+/bin.tidy.infinity.json
+/bin/querybuilder.json
+/apps.tidy.infinity.json
+/var/classes.tidy.infinity.json
+/content.infinity.json
+/composer.json
+/libs/cq/core/content/welcome.html
+/siteadmin
+/damadmin
+/libs/cq/workflow/content/inbox.html
+/crx/explorer/ui/search.jsp?Path=&Query=
+/libs/cq/search/content/querydebug.html
+/etc/clientcontext/default/content.html
+/libs/cq/i18n/translator.html
+/miscadmin
+/libs/granite/backup/content/admin.html
+/miscadmin#/etc/mobile
+/miscadmin#/etc/blueprints
+/miscadmin#/etc/designs
+/libs/cq/tagging/content/tagadmin.html
+/miscadmin#/etc/segmentation
+/miscadmin#/etc/msm/rolloutconfigs
+/damadmin#/content/dam
+/miscadmin#/etc/importers
+/etc/cloudservices.html
+/crx/packmgr/index.jsp
+/crx/packageshare
+/crx/de
+/system/console/profiler
+/system/console/diskbenchmark
+/libs/cq/workflow/content/console.html
+/libs/cq/workflow/content/inbox.html
+/etc/replication.html
+/etc/replication/treeactivation.html
+/etc/replication/agents.author.html
+/etc/replication/agents.publish.html
+/etc/replication/agents.publish/flush.html
+/libs/cq/ui/content/dumplibs.html
+/etc/reports/auditreport.html
+/etc/reports/diskusage.html
+/etc/reports/diskusage.html?path=/content/dam
+/etc/reports/userreport.html
+/crx/explorer/browser/index.jsp
+/crx/explorer/nodetypes/index.jsp
+/system/console/jmx/com.adobe.granite%3Atype%3DRepository
+/libs/granite/cluster/content/admin.html
+/system/console
+/system/console/configMgr
+/system/console/jmx/java.lang%3Atype%3DRuntime
+/system/console/memoryusage
+/system/console/vmstat
+/system/console/productinfo
+/system/console/profiler
+/system/console/diskbenchmark
+/libs/granite/backup/content/admin.html
+/system/console/mimetypes
+/system/console/licenses
+/lc/content/ws
+/workspace
+/ReaderExtensions
+/mobileformsivs
+/lc/crx/packmgr/index.jsp
+/lc/cm/
+/adminui
+/lc/system/console

Discovery/Web_Content/Jenkins-Hudson.txt

@@ -0,0 +1,11 @@
+/view/All/builds
+/view/All/newjob
+/asynchPeople/
+/userContent/
+/computer/
+/pview/
+/systeminf
+/systemInfo
+/script
+/signup
+/securityRealm/createAccount

Passwords/DefaultCreds/default-passwords.csv

@@ -1,4 +1,5 @@
 Vendor,Username,Password,Comments
+<N/A>,<N/A>,H4!b5at+kWls-8yh4Guq,Troll from: https://mostsecure.pw/
 "2Wire, Inc.",http,<BLANK>,
 360 Systems,factory,factory,
 3COM,3comcso,RIP000,Resets all passwords to defaults
@@ -564,6 +565,7 @@ Cisco,uwmadmin,password,http://www.cisco.com/c/en/us/td/docs/cloud_services/cisc
 Cisco,wlse,wlsedb,
 Cisco,wlseuser,wlsepassword,
 Cisco-Arrowpoint,admin,system,
+Cisco-Ironport,admin,ironport,
 Citel,<BLANK>,citel,
 Citel,citel,password,
 "Citrix Systems, Inc.",nsroot,nsroot,http://support.citrix.com/proddocs/topic/access-gateway-hig-appliances/ag-using-setup-wizard-tsk.html

Passwords/LeakedDB/passwords-youporn2012.txt

@@ -4062,6 +4062,3 @@ hello2
 hooligan1
 joker666
 hielox
-<<<<<<< HEAD
-=======
-hielox

Passwords/Malware/mirai-botnet.txt

@@ -40,7 +40,7 @@ root hi3518
 root jvbzd
 root anko
 root zlxx.
-root 7ujMko9vizxv
+root 7ujMko0vizxv
 root 7ujMko0admin
 root system
 root ikwb
@@ -58,4 +58,3 @@ admin pass
 admin meinsm
 tech tech
 mother fucker
-

Pattern_Matching/repo_scan.txt

@@ -0,0 +1,119 @@
+api
+api_key
+api_secret_key
+secret_key
+secret
+BEGIN
+PRIVATE
+private
+PRIVATE_KEY
+private_key
+key
+token
+CSRF
+Arrays.equals
+HMAC
+random
+mt_rand
+rand
+random.org
+iv
+encrypt
+crypt
+MCRYPT
+RIJNDAEL
+MCRYPT_RIJNDAEL_256
+ECB
+ecb
+password
+passwd
+pass
+hash
+hashlib
+hashed
+md5
+sha1
+sha-1
+sha2
+sha-2
+salt
+bcrypt
+$2a$
+PBKDF2
+blake2
+CVE
+vulnerable
+stackoverflow
+SO
+base64
+Base64
+admin
+rot13
+tmp
+system
+exec
+popen
+backtick operator
+pcntl_exec
+eval
+preg_replace
+create_function
+exec
+passthru
+system
+shell_exec
+popen
+proc_open
+pcntl_exec
+assert
+preg_replace('/.*/e',
+create_function
+include
+include_once
+require
+require_once
+$_GET
+phpinfo
+posix_mkfifo
+posix_getlogin
+posix_ttyname
+getenv
+get_current_user
+proc_get_status
+get_cfg_var
+disk_free_space
+disk_total_space
+diskfreespace
+getcwd
+getlastmo
+getmygid
+getmyinode
+getmypid
+getmyuid
+extract
+parse_str
+putenv
+ini_set
+mail
+header
+proc_nice
+proc_terminate
+proc_close
+pfsockopen
+fsockopen
+apache_child_terminate
+posix_kill
+posix_mkfifo
+posix_setpgid
+posix_setsid
+posix_setuid
+chmod
+chown
+shell=True
+pickle.loads
+yaml.load
+debug
+DebuggedApplication
+Debug=True
+evalex=True
+Math.random