Commit 66eb0448 authored by Robert Graham's avatar Robert Graham
Browse files

ticketbleed

parent dc88677a
Loading
Loading
Loading
Loading
+14 −1
Changes for src/main-conf.c: 14 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ masscan_echo(struct Masscan *masscan, FILE *fp)
    fprintf(fp, "%scapture = cert\n", masscan->is_capture_cert?"":"no");
    fprintf(fp, "%scapture = html\n", masscan->is_capture_html?"":"no");
    fprintf(fp, "%scapture = heartbleed\n", masscan->is_capture_heartbleed?"":"no");
    fprintf(fp, "%scapture = ticketbleed\n", masscan->is_capture_ticketbleed?"":"no");

    /*
     *  TCP payloads
@@ -1070,6 +1071,8 @@ masscan_set_parameter(struct Masscan *masscan,
            masscan->is_capture_html = 1;
        else if (EQUALS("heartbleed", value))
            masscan->is_capture_heartbleed = 1;
        else if (EQUALS("ticketbleed", value))
            masscan->is_capture_ticketbleed = 1;
        else {
            fprintf(stderr, "FAIL: %s: unknown capture type\n", value);
            exit(1);
@@ -1081,6 +1084,8 @@ masscan_set_parameter(struct Masscan *masscan,
            masscan->is_capture_html = 0;
        else if (EQUALS("heartbleed", value))
            masscan->is_capture_heartbleed = 0;
        else if (EQUALS("ticketbleed", value))
            masscan->is_capture_ticketbleed = 0;
        else {
            fprintf(stderr, "FAIL: %s: unknown capture type\n", value);
            exit(1);
@@ -1204,6 +1209,11 @@ masscan_set_parameter(struct Masscan *masscan,
        masscan_set_parameter(masscan, "no-capture", "cert");
        masscan_set_parameter(masscan, "no-capture", "heartbleed");
        masscan_set_parameter(masscan, "banners", "true");
    } else if (EQUALS("ticketbleed", name)) {
        masscan->is_ticketbleed = 1;
        masscan_set_parameter(masscan, "no-capture", "cert");
        masscan_set_parameter(masscan, "no-capture", "ticketbleed");
        masscan_set_parameter(masscan, "banners", "true");
    } else if (EQUALS("hello-file", name)) {
        /* When connecting via TCP, send this file */
        FILE *fp;
@@ -1525,6 +1535,9 @@ masscan_set_parameter(struct Masscan *masscan,
    } else if (EQUALS("script", name)) {
        if (EQUALS("heartbleed", value)) {
            masscan_set_parameter(masscan, "heartbleed", "true");
            return;
		} else if (EQUALS("ticketbleed", value)) {
            masscan_set_parameter(masscan, "ticketbleed", "true");
            return;
        } else if (EQUALS("poodle", value) || EQUALS("sslv3", value)) {
            masscan->is_poodle_sslv3 = 1;
@@ -1679,7 +1692,7 @@ is_singleton(const char *name)
        "badsum", "reason", "open", "open-only",
        "packet-trace", "release-memory",
        "log-errors", "append-output", "webxml", "no-stylesheet",
        "no-stylesheet", "heartbleed",
        "no-stylesheet", "heartbleed", "ticketbleed",
        "send-eth", "send-ip", "iflist", "randomize-hosts",
        "nmap", "trace-packet", "pfring", "sendq",
        "banners", "banner", "nobanners", "nobanner",
+7 −1
Changes for src/main.c: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -615,7 +615,8 @@ receive_thread(void *v)
        tcpcon_set_banner_flags(tcpcon,
                masscan->is_capture_cert,
                masscan->is_capture_html,
                masscan->is_capture_heartbleed);
                masscan->is_capture_heartbleed,
				masscan->is_capture_ticketbleed);
        if (masscan->http_user_agent_length)
            tcpcon_set_parameter(   tcpcon,
                                    "http-user-agent",
@@ -626,6 +627,11 @@ receive_thread(void *v)
                                 "heartbleed",
                                 1,
                                 "1");
        if (masscan->is_ticketbleed)
            tcpcon_set_parameter(   tcpcon,
                                 "ticketbleed",
                                 1,
                                 "1");
        if (masscan->is_poodle_sslv3)
            tcpcon_set_parameter(   tcpcon,
                                 "sslv3",
+2
Changes for src/masscan-app.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ masscan_app_to_string(enum ApplicationProtocol proto)
    case PROTO_NTP:     return "ntp";
    case PROTO_VULN:    return "vuln";
    case PROTO_HEARTBLEED:    return "heartbleed";
    case PROTO_TICKETBLEED:    return "ticketbleed";
    case PROTO_VNC_RFB: return "vnc";
    case PROTO_SAFE:    return "safe";
            
@@ -68,6 +69,7 @@ masscan_string_to_app(const char *str)
        {"ntp", PROTO_NTP},
        {"vuln", PROTO_VULN},
        {"heartbleed", PROTO_HEARTBLEED},
        {"ticketbleed", PROTO_TICKETBLEED},
        {"vnc", PROTO_VNC_RFB},
        {"safe",    PROTO_SAFE},
        {0,0}
+1
Changes for src/masscan-app.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ enum ApplicationProtocol {
    PROTO_NTP,              /* network time protocol, udp/123 */
    PROTO_VULN,
    PROTO_HEARTBLEED,
    PROTO_TICKETBLEED,
    PROTO_VNC_RFB,
    PROTO_SAFE,
};
+2
Changes for src/masscan.h: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -171,10 +171,12 @@ struct Masscan
    unsigned is_capture_cert:1; /* --capture cert */
    unsigned is_capture_html:1; /* --capture html */
    unsigned is_capture_heartbleed:1; /* --capture heartbleed */
    unsigned is_capture_ticketbleed:1; /* --capture ticket */
    unsigned is_test_csv:1;     /* (temporary testing feature) */
    unsigned is_infinite:1;     /* -infinite */
    unsigned is_readscan:1;     /* --readscan, Operation_Readscan */
    unsigned is_heartbleed:1;   /* --heartbleed, scan for this vuln */
    unsigned is_ticketbleed:1;   /* --ticketbleed, scan for this vuln */
    unsigned is_poodle_sslv3:1; /* --script poodle, scan for this vuln */
        
    /**
Loading