Commit 08ddfde4 authored by robertdavidgraham's avatar robertdavidgraham
Browse files

Merge branch 'master' of https://github.com/robertdavidgraham/masscan

parents 8439cfb0 51acc1d7

Makefile

+7 −0
Original line number Diff line number Diff line
@@ -50,6 +50,13 @@ INCLUDES = -I. 
FLAGS2 = 

endif



# FreeBSD

ifneq (, $(findstring freebsd, $(SYS)))

LIBS = -lpcap -lm -pthread

INCLUDES = -I.

FLAGS2 =

endif



# this works on llvm or real gcc

CC = gcc

src/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1380,6 +1380,7 @@ int main(int argc, char *argv[]) 
         */

        {

            int x = 0;

            x += banner1_selftest();

            x += output_selftest();

            x += siphash24_selftest();

            x += snmp_selftest();
@@ -1392,7 +1393,6 @@ int main(int argc, char *argv[]) 
            x += pixie_time_selftest();

            x += rte_ring_selftest();

            x += smack_selftest();

            x += banner1_selftest();

            x += mainconf_selftest();

            x += zeroaccess_selftest();

src/proto-banner1.c

+8 −1
Original line number Diff line number Diff line
@@ -328,6 +328,13 @@ int banner1_selftest() 
    }*/





    return 0;

    {

        int x = 0;



        x += banner_ssl.selftest();

        x += banner_http.selftest();



        return x;

    }

}

src/proto-banner1.h

+5 −3
Original line number Diff line number Diff line
@@ -27,10 +27,12 @@ struct SSL_SERVER_HELLO { 
struct SSL_SERVER_CERT {

    unsigned state;

    unsigned remaining;

    unsigned cert_remaining;

    unsigned cert_state;

    unsigned b64x;

    unsigned banner_offset_start;

    struct {

        unsigned remaining;

        unsigned state;

        unsigned b64x;

    } sub;

};



struct SSLRECORD {

src/proto-ssl.c

+1651 −10

File changed.

Preview size limit exceeded, changes collapsed.