diff --git a/src/crypto-blackrock2.c b/src/crypto-blackrock2.c index 206d6f17f39ada40d4a4e9e95e5f3ffdd8c2c9a2..8ed57c621e1912daac587537920c6c0fa04653de 100644 --- a/src/crypto-blackrock2.c +++ b/src/crypto-blackrock2.c @@ -179,7 +179,7 @@ static const uint32_t SB8[64] = /*************************************************************************** * It's an s-box. You gotta have an s-box ***************************************************************************/ -static const unsigned char sbox[] = { +const unsigned char sbox2[] = { 0x91, 0x58, 0xb3, 0x31, 0x6c, 0x33, 0xda, 0x88, 0x57, 0xdd, 0x8c, 0xf2, 0x29, 0x5a, 0x08, 0x9f, 0x49, 0x34, 0xce, 0x99, 0x9e, 0xbf, 0x0f, 0x81, @@ -311,22 +311,22 @@ ROUND(uint64_t r, uint64_t R, uint64_t seed) } return Y; #if 0 - r0 = sbox[GETBYTE(R,0)]<< 6 | sbox[GETBYTE(R,1)]<< 0; - r1 = sbox[GETBYTE(R,2)]<< 6 | sbox[GETBYTE(R,5)]<< 0; - r2 = sbox[GETBYTE(R,4)]<< 6 | sbox[GETBYTE(R,5)]<< 0; - r3 = sbox[GETBYTE(R,6)]<< 6 | sbox[GETBYTE(R,7)]<< 0; + r0 = sbox2[GETBYTE(R,0)]<< 6 | sbox2[GETBYTE(R,1)]<< 0; + r1 = sbox2[GETBYTE(R,2)]<< 6 | sbox2[GETBYTE(R,5)]<< 0; + r2 = sbox2[GETBYTE(R,4)]<< 6 | sbox2[GETBYTE(R,5)]<< 0; + r3 = sbox2[GETBYTE(R,6)]<< 6 | sbox2[GETBYTE(R,7)]<< 0; R = r0 ^ (r1<<12) * (r2 << 24) ^ (r3 << 36) * r; return R; - /*return((uint64_t)sbox[GETBYTE(R,7ULL)]<< 0ULL) - | ((uint64_t)sbox[GETBYTE(R,6ULL)]<< 8ULL) - | ((uint64_t)sbox[GETBYTE(R,5ULL)]<<16ULL) - | ((uint64_t)sbox[GETBYTE(R,4ULL)]<<24ULL) - | ((uint64_t)sbox[GETBYTE(R,3ULL)]<<32ULL) - | ((uint64_t)sbox[GETBYTE(R,2ULL)]<<40ULL) - | ((uint64_t)sbox[GETBYTE(R,1ULL)]<<48ULL) - | ((uint64_t)sbox[GETBYTE(R,0ULL)]<<56ULL) + /*return((uint64_t)sbox2[GETBYTE(R,7ULL)]<< 0ULL) + | ((uint64_t)sbox2[GETBYTE(R,6ULL)]<< 8ULL) + | ((uint64_t)sbox2[GETBYTE(R,5ULL)]<<16ULL) + | ((uint64_t)sbox2[GETBYTE(R,4ULL)]<<24ULL) + | ((uint64_t)sbox2[GETBYTE(R,3ULL)]<<32ULL) + | ((uint64_t)sbox2[GETBYTE(R,2ULL)]<<40ULL) + | ((uint64_t)sbox2[GETBYTE(R,1ULL)]<<48ULL) + | ((uint64_t)sbox2[GETBYTE(R,0ULL)]<<56ULL) ;*/ return R; #endif diff --git a/src/main-initadapter.c b/src/main-initadapter.c index d38fd254e9f71dfb9e794bb07d12c885aa392ea7..8fa518dc8cccc2c54910fe6e8fc87fd6d75ea75b 100644 --- a/src/main-initadapter.c +++ b/src/main-initadapter.c @@ -38,7 +38,7 @@ masscan_initialize_adapter( * the best Interface to use. We do this by choosing the first * interface with a "default route" (aka. "gateway") defined */ - if (masscan->nic[index].ifname && masscan->nic[index].ifname[0]) + if (masscan->nic[index].ifname[0]) ifname = masscan->nic[index].ifname; else { /* no adapter specified, so find a default one */ diff --git a/src/pixie-threads.c b/src/pixie-threads.c index 997efb6ff33960a65f5d85c63fedd5364728a1f2..e57fad2c9413caf47990fe519fb259184ded91e9 100644 --- a/src/pixie-threads.c +++ b/src/pixie-threads.c @@ -204,6 +204,6 @@ void pixie_thread_join(size_t thread_handle) #else void *p; - pthread_join(thread_handle, &p); + pthread_join((pthread_t)thread_handle, &p); #endif } diff --git a/src/proto-preprocess.c b/src/proto-preprocess.c index 619d983fdd44e254f3a79241218cc686c7471351..fe8572c805f403e3454a633d102ce1e997c00a01 100644 --- a/src/proto-preprocess.c +++ b/src/proto-preprocess.c @@ -11,8 +11,9 @@ ****************************************************************************/ #include "proto-preprocess.h" -#include <stdio.h> #include <assert.h> +#include <stdio.h> +#include <string.h> #define ex32be(px) ( *((unsigned char*)(px)+0)<<24 \ | *((unsigned char*)(px)+1)<<16 \ @@ -58,6 +59,7 @@ preprocess_frame(const unsigned char *px, unsigned length, unsigned link_type, info->found = FOUND_NOTHING; info->found_offset = 0; + /* If not standard Ethernet, go do something else */ if (link_type != 1) goto parse_linktype; @@ -427,19 +429,54 @@ parse_linktype: case 1: goto parse_ethernet; case 12: goto parse_ipv4; case 0x69: goto parse_wifi; + case 113: goto parse_linux_sll; /* LINKTYPE_LINUX_SLL DLT_LINUX_SLL */ case 119: goto parse_prism_header; case 127: goto parse_radiotap_header; default: return 0; } - + +parse_linux_sll: /* - +--------+--------+--------+--------+ - | hardware type | protocol type | - +--------+--------+--------+--------+ - | h-len | p-len | opcode | - +--------+--------+--------+--------+ - */ - + +--------+--------+ + | packet type | + +--------+--------+ + | ARPHRD_ type | + +--------+--------+ + | addr length | + +--------+--------+ + | | + + first 8 bytes + + | of the | + + hardware/MAC + + | address | + + + + | | + +--------+--------+ + | ethertype | + +--------+--------+ + */ + { + struct { + unsigned packet_type; + unsigned arp_type; + unsigned addr_length; + unsigned char mac_address[8]; + unsigned ethertype; + } sll; + + VERIFY_REMAINING(16, FOUND_SLL); + + sll.packet_type = ex16be(px+offset+0); + sll.arp_type = ex16be(px+offset+2); + sll.addr_length = ex16be(px+offset+4); + memcpy(sll.mac_address, px+offset+6, 8); + sll.ethertype = ex16be(px+offset+14); + + offset += 16; + + goto parse_ethertype; + } + parse_arp: info->ip_version = 256; info->ip_offset = offset; diff --git a/src/proto-preprocess.h b/src/proto-preprocess.h index 91b41edbfd1770cf0722315abc2b045f9935c20b..514a26ce090aab068eae84a7ce2c472c0ed5adb2 100644 --- a/src/proto-preprocess.h +++ b/src/proto-preprocess.h @@ -21,6 +21,7 @@ enum { FOUND_PRISM, FOUND_LLC, FOUND_ARP, + FOUND_SLL, /* Linux SLL */ }; struct PreprocessedInfo { const unsigned char *mac_src; diff --git a/src/proto-snmp.c b/src/proto-snmp.c index 3dc87db593d079bb53b89a23eb21233978c57ff8..a34135f12ee7a171f080e2719dc23014e71aceec 100644 --- a/src/proto-snmp.c +++ b/src/proto-snmp.c @@ -471,10 +471,10 @@ snmp_set_cookie(unsigned char *px, size_t length, uint64_t seqno) return 0; } -#define TWO_BYTE ((~0)<<7) -#define THREE_BYTE ((~0)<<14) -#define FOUR_BYTE ((~0)<<21) -#define FIVE_BYTE ((~0)<<28) +#define TWO_BYTE ((unsigned long long)(~0)<<7) +#define THREE_BYTE ((unsigned long long)(~0)<<14) +#define FOUR_BYTE ((unsigned long long)(~0)<<21) +#define FIVE_BYTE ((unsigned long long)(~0)<<28) /**************************************************************************** diff --git a/src/proto-x509.c b/src/proto-x509.c index 77db24b67b3c2d5a8b1a2971848e8f86e0d3c7b2..2c99c710149450dc56cb30a4758a695d6af45bcd 100644 --- a/src/proto-x509.c +++ b/src/proto-x509.c @@ -176,10 +176,10 @@ static struct ObjectIdentifer { static unsigned id_prefix_count(unsigned id) { -#define TWO_BYTE ((~0)<<7) -#define THREE_BYTE ((~0)<<14) -#define FOUR_BYTE ((~0)<<21) -#define FIVE_BYTE ((~0)<<28) +#define TWO_BYTE ((unsigned long long)(~0)<<7) +#define THREE_BYTE ((unsigned long long)(~0)<<14) +#define FOUR_BYTE ((unsigned long long)(~0)<<21) +#define FIVE_BYTE ((unsigned long long)(~0)<<28) if (id & FIVE_BYTE) return 4; diff --git a/xcode4/masscan.xcodeproj/project.pbxproj b/xcode4/masscan.xcodeproj/project.pbxproj index 17c5c10dbb2908a7301ec7b421e4be07734420f3..00f639dbac5659dc395da7ce51dcd0b987073fbe 100644 --- a/xcode4/masscan.xcodeproj/project.pbxproj +++ b/xcode4/masscan.xcodeproj/project.pbxproj @@ -293,22 +293,46 @@ 11A9219217DBCC7E00DDFD32 /* src */ = { isa = PBXGroup; children = ( + 11B360CD1F90174B0020F3A3 /* misc */, + 11B360C71F90166D0020F3A3 /* rawsock */, + 11B360CC1F90170D0020F3A3 /* crypto */, + 11B360C81F90169F0020F3A3 /* main */, + 11B360C91F9016AD0020F3A3 /* out */, + 11B360CB1F9016D80020F3A3 /* pixie */, + 11B360CA1F9016C00020F3A3 /* proto */, + ); + name = src; + path = ../src; + sourceTree = "<group>"; + }; + 11B360C71F90166D0020F3A3 /* rawsock */ = { + isa = PBXGroup; + children = ( + 116806EA1995D421005B0980 /* rawsock-adapter.h */, + 11A921BC17DBCC7E00DDFD32 /* rawsock-arp.c */, + 11A921BD17DBCC7E00DDFD32 /* rawsock-getif.c */, + 11A921BE17DBCC7E00DDFD32 /* rawsock-getip.c */, + 11A921BF17DBCC7E00DDFD32 /* rawsock-getmac.c */, + 11A921C017DBCC7E00DDFD32 /* rawsock-getroute.c */, + 11A921C117DBCC7E00DDFD32 /* rawsock-pcapfile.c */, + 11A921C217DBCC7E00DDFD32 /* rawsock-pcapfile.h */, + 11A921C317DBCC7E00DDFD32 /* rawsock-pfring.c */, + 11A921C417DBCC7E00DDFD32 /* rawsock-pfring.h */, + 11A921C517DBCC7E00DDFD32 /* rawsock.c */, 11C936C51EDCE8B40023D32E /* rawsock-pcap.c */, 11C936C61EDCE8B40023D32E /* rawsock-pcap.h */, - 11C936BF1EDCE77F0023D32E /* in-filter.c */, - 11C936C01EDCE77F0023D32E /* in-filter.h */, - 11C936C11EDCE77F0023D32E /* in-report.c */, - 11C936C21EDCE77F0023D32E /* in-report.h */, - 11126596197A086B00DC5987 /* out-unicornscan.c */, - 11A773E91881BFC700B135DE /* crypto-base64.c */, - 11A773EA1881BFC700B135DE /* crypto-base64.h */, - 11B05EA418B9649F009C935E /* crypto-blackrock2.c */, - 11A9219317DBCC7E00DDFD32 /* event-timeout.c */, - 11A9219417DBCC7E00DDFD32 /* event-timeout.h */, - 11A868081816F3A7008E00B8 /* in-binary.c */, - 11A868091816F3A7008E00B8 /* in-binary.h */, - 11A9219517DBCC7E00DDFD32 /* logger.c */, - 11A9219617DBCC7E00DDFD32 /* logger.h */, + ); + name = rawsock; + sourceTree = "<group>"; + }; + 11B360C81F90169F0020F3A3 /* main */ = { + isa = PBXGroup; + children = ( + 11A8680D1816F3A7008E00B8 /* masscan-app.c */, + 11A8680E1816F3A7008E00B8 /* masscan-app.h */, + 113AD3B818208A1900D5E067 /* masscan-status.h */, + 11BA295E18902CEE0064A759 /* masscan-version.h */, + 11A921A017DBCC7E00DDFD32 /* masscan.h */, 11A9219717DBCC7E00DDFD32 /* main-conf.c */, 11A9219817DBCC7E00DDFD32 /* main-dedup.c */, 11A9219917DBCC7E00DDFD32 /* main-dedup.h */, @@ -326,11 +350,21 @@ 11A9219D17DBCC7E00DDFD32 /* main-throttle.c */, 11A9219E17DBCC7E00DDFD32 /* main-throttle.h */, 11A9219F17DBCC7E00DDFD32 /* main.c */, - 11A8680D1816F3A7008E00B8 /* masscan-app.c */, - 11A8680E1816F3A7008E00B8 /* masscan-app.h */, - 113AD3B818208A1900D5E067 /* masscan-status.h */, - 11BA295E18902CEE0064A759 /* masscan-version.h */, - 11A921A017DBCC7E00DDFD32 /* masscan.h */, + ); + name = main; + sourceTree = "<group>"; + }; + 11B360C91F9016AD0020F3A3 /* out */ = { + isa = PBXGroup; + children = ( + 11623F69191E0DB00075EEE6 /* out-certs.c */, + 11A868081816F3A7008E00B8 /* in-binary.c */, + 11A868091816F3A7008E00B8 /* in-binary.h */, + 11C936BF1EDCE77F0023D32E /* in-filter.c */, + 11C936C01EDCE77F0023D32E /* in-filter.h */, + 11C936C11EDCE77F0023D32E /* in-report.c */, + 11C936C21EDCE77F0023D32E /* in-report.h */, + 11126596197A086B00DC5987 /* out-unicornscan.c */, 11A921A117DBCC7E00DDFD32 /* out-binary.c */, 11BA295F18902CEE0064A759 /* out-grepable.c */, 11A50CAD191C128F006D5802 /* out-json.c */, @@ -341,16 +375,13 @@ 11A921A417DBCC7E00DDFD32 /* out-xml.c */, 11A921A517DBCC7E00DDFD32 /* output.c */, 11A921A617DBCC7E00DDFD32 /* output.h */, - 11A921A717DBCC7E00DDFD32 /* packet-queue.h */, - 11E76DB21889BC5200061F45 /* pixie-backtrace.c */, - 11E76DB31889BC5200061F45 /* pixie-backtrace.h */, - 11A868101816F3A7008E00B8 /* pixie-file.c */, - 11A868111816F3A7008E00B8 /* pixie-file.h */, - 11A868121816F3A7008E00B8 /* pixie-sockets.h */, - 11A921A817DBCC7E00DDFD32 /* pixie-threads.c */, - 11A921A917DBCC7E00DDFD32 /* pixie-threads.h */, - 11A921AA17DBCC7E00DDFD32 /* pixie-timer.c */, - 11A921AB17DBCC7E00DDFD32 /* pixie-timer.h */, + ); + name = out; + sourceTree = "<group>"; + }; + 11B360CA1F9016C00020F3A3 /* proto */ = { + isa = PBXGroup; + children = ( 11A921AC17DBCC7E00DDFD32 /* proto-arp.c */, 11A921AD17DBCC7E00DDFD32 /* proto-arp.h */, 11A921AE17DBCC7E00DDFD32 /* proto-banner1.c */, @@ -360,18 +391,27 @@ 115C0CA418035BC5004E6CD7 /* proto-dns-parse.h */, 11B039C317E7834000925E7E /* proto-dns.c */, 11B039C417E7834000925E7E /* proto-dns.h */, + 11420DD719A8160500DB5BFE /* proto-ftp.c */, + 11420DD619A815CD00DB5BFE /* proto-ftp.h */, 11AC80E717E0DAD4001BCE3A /* proto-http.c */, 11AC80E817E0DAD4001BCE3A /* proto-http.h */, 11AC80E917E0DAD4001BCE3A /* proto-icmp.c */, 11AC80EA17E0DAD4001BCE3A /* proto-icmp.h */, + 11420DE219A9363A00DB5BFE /* proto-imap4.c */, + 11420DE119A9361500DB5BFE /* proto-imap4.h */, + 11420DDF19A90CB300DB5BFE /* proto-interactive.c */, 115C0CA518035BC5004E6CD7 /* proto-netbios.c */, 115C0CA618035BC5004E6CD7 /* proto-netbios.h */, 11BA296A189060220064A759 /* proto-ntp.c */, 11BA296C189060590064A759 /* proto-ntp.h */, + 11420DDD19A8FDE300DB5BFE /* proto-pop3.c */, + 11420DDC19A8F2D200DB5BFE /* proto-pop3.h */, 11A921B017DBCC7E00DDFD32 /* proto-preprocess.c */, 11A921B117DBCC7E00DDFD32 /* proto-preprocess.h */, 11AC2F99188CE34A008CB623 /* proto-sctp.c */, 11AC2F9A188CE34A008CB623 /* proto-sctp.h */, + 11420DDA19A84A9E00DB5BFE /* proto-smtp.c */, + 11420DD919A844B000DB5BFE /* proto-smtp.h */, 11B039C917EA092B00925E7E /* proto-snmp.c */, 11B039CA17EA092B00925E7E /* proto-snmp.h */, 11AC80EB17E0DAD4001BCE3A /* proto-ssh.c */, @@ -385,70 +425,86 @@ 11A921B317DBCC7E00DDFD32 /* proto-tcp.h */, 11B039C517E7834000925E7E /* proto-udp.c */, 11B039C617E7834000925E7E /* proto-udp.h */, + 11420DD219A2D47A00DB5BFE /* proto-vnc.c */, + 11420DD519A2D48C00DB5BFE /* proto-vnc.h */, 11B22ED318641DCC00DA5438 /* proto-x509.c */, 11B22ED418641DCC00DA5438 /* proto-x509.h */, 11A8681C1819A6F7008E00B8 /* proto-zeroaccess.c */, 11A8681D1819A6F7008E00B8 /* proto-zeroaccess.h */, + 11F9375619F1AD5000C1947F /* script-heartbleed.c */, + 11F9375319F1A54200C1947F /* script-sslv3.c */, + 11B2DD9C17DE4DD8007FC363 /* templ-payloads.c */, + 11B2DD9D17DE4DD8007FC363 /* templ-payloads.h */, + 11A921D117DBCC7E00DDFD32 /* templ-pkt.c */, + 11A921D217DBCC7E00DDFD32 /* templ-pkt.h */, + 115C0CA918035BC5004E6CD7 /* templ-port.h */, + ); + name = proto; + sourceTree = "<group>"; + }; + 11B360CB1F9016D80020F3A3 /* pixie */ = { + isa = PBXGroup; + children = ( + 11E76DB21889BC5200061F45 /* pixie-backtrace.c */, + 11E76DB31889BC5200061F45 /* pixie-backtrace.h */, + 11A868101816F3A7008E00B8 /* pixie-file.c */, + 11A868111816F3A7008E00B8 /* pixie-file.h */, + 11A868121816F3A7008E00B8 /* pixie-sockets.h */, + 11A921A817DBCC7E00DDFD32 /* pixie-threads.c */, + 11A921A917DBCC7E00DDFD32 /* pixie-threads.h */, + 11A921AA17DBCC7E00DDFD32 /* pixie-timer.c */, + 11A921AB17DBCC7E00DDFD32 /* pixie-timer.h */, + ); + name = pixie; + sourceTree = "<group>"; + }; + 11B360CC1F90170D0020F3A3 /* crypto */ = { + isa = PBXGroup; + children = ( + 11A773E91881BFC700B135DE /* crypto-base64.c */, + 11A773EA1881BFC700B135DE /* crypto-base64.h */, + 11B05EA418B9649F009C935E /* crypto-blackrock2.c */, 11A921B417DBCC7E00DDFD32 /* rand-blackrock.c */, 11A921B517DBCC7E00DDFD32 /* rand-blackrock.h */, 11A921B617DBCC7E00DDFD32 /* rand-lcg.c */, 11A921B717DBCC7E00DDFD32 /* rand-lcg.h */, 11A921B817DBCC7E00DDFD32 /* rand-primegen.c */, 11A921B917DBCC7E00DDFD32 /* rand-primegen.h */, + 11A868131816F3A7008E00B8 /* siphash24.c */, + 11A868141816F3A7008E00B8 /* siphash24.h */, + 11A921CF17DBCC7E00DDFD32 /* syn-cookie.c */, + 11A921D017DBCC7E00DDFD32 /* syn-cookie.h */, + ); + name = crypto; + sourceTree = "<group>"; + }; + 11B360CD1F90174B0020F3A3 /* misc */ = { + isa = PBXGroup; + children = ( + 115C0CAA18035BC5004E6CD7 /* unusedparm.h */, + 11A921D317DBCC7E00DDFD32 /* xring.c */, + 11A921D417DBCC7E00DDFD32 /* xring.h */, 11A921BA17DBCC7E00DDFD32 /* ranges.c */, 11A921BB17DBCC7E00DDFD32 /* ranges.h */, - 11A921BC17DBCC7E00DDFD32 /* rawsock-arp.c */, - 11A921BD17DBCC7E00DDFD32 /* rawsock-getif.c */, - 11A921BE17DBCC7E00DDFD32 /* rawsock-getip.c */, - 11A921BF17DBCC7E00DDFD32 /* rawsock-getmac.c */, - 11A921C017DBCC7E00DDFD32 /* rawsock-getroute.c */, - 11A921C117DBCC7E00DDFD32 /* rawsock-pcapfile.c */, - 11A921C217DBCC7E00DDFD32 /* rawsock-pcapfile.h */, - 11A921C317DBCC7E00DDFD32 /* rawsock-pfring.c */, - 11A921C417DBCC7E00DDFD32 /* rawsock-pfring.h */, - 11A921C517DBCC7E00DDFD32 /* rawsock.c */, 11A921C617DBCC7E00DDFD32 /* rawsock.h */, 11A921C717DBCC7E00DDFD32 /* rte-ring.c */, 11A921C817DBCC7E00DDFD32 /* rte-ring.h */, 11BA29681890560C0064A759 /* script-ntp-monlist.c */, 11BA2966189055CA0064A759 /* script.c */, 11BA296518904F3A0064A759 /* script.h */, - 11A868131816F3A7008E00B8 /* siphash24.c */, - 11A868141816F3A7008E00B8 /* siphash24.h */, 11A921C917DBCC7E00DDFD32 /* smack.h */, 11A921CA17DBCC7E00DDFD32 /* smack1.c */, 11A921CB17DBCC7E00DDFD32 /* smackqueue.c */, 11A921CC17DBCC7E00DDFD32 /* smackqueue.h */, 11A921CD17DBCC7E00DDFD32 /* string_s.c */, 11A921CE17DBCC7E00DDFD32 /* string_s.h */, - 11A921CF17DBCC7E00DDFD32 /* syn-cookie.c */, - 11A921D017DBCC7E00DDFD32 /* syn-cookie.h */, - 11B2DD9C17DE4DD8007FC363 /* templ-payloads.c */, - 11B2DD9D17DE4DD8007FC363 /* templ-payloads.h */, - 11A921D117DBCC7E00DDFD32 /* templ-pkt.c */, - 11A921D217DBCC7E00DDFD32 /* templ-pkt.h */, - 115C0CA918035BC5004E6CD7 /* templ-port.h */, - 115C0CAA18035BC5004E6CD7 /* unusedparm.h */, - 11A921D317DBCC7E00DDFD32 /* xring.c */, - 11A921D417DBCC7E00DDFD32 /* xring.h */, - 11623F69191E0DB00075EEE6 /* out-certs.c */, - 116806EA1995D421005B0980 /* rawsock-adapter.h */, - 11420DD219A2D47A00DB5BFE /* proto-vnc.c */, - 11420DD519A2D48C00DB5BFE /* proto-vnc.h */, - 11420DD619A815CD00DB5BFE /* proto-ftp.h */, - 11420DD719A8160500DB5BFE /* proto-ftp.c */, - 11420DD919A844B000DB5BFE /* proto-smtp.h */, - 11420DDA19A84A9E00DB5BFE /* proto-smtp.c */, - 11420DDC19A8F2D200DB5BFE /* proto-pop3.h */, - 11420DDD19A8FDE300DB5BFE /* proto-pop3.c */, - 11420DDF19A90CB300DB5BFE /* proto-interactive.c */, - 11420DE119A9361500DB5BFE /* proto-imap4.h */, - 11420DE219A9363A00DB5BFE /* proto-imap4.c */, - 11F9375319F1A54200C1947F /* script-sslv3.c */, - 11F9375619F1AD5000C1947F /* script-heartbleed.c */, + 11A921A717DBCC7E00DDFD32 /* packet-queue.h */, + 11A9219317DBCC7E00DDFD32 /* event-timeout.c */, + 11A9219417DBCC7E00DDFD32 /* event-timeout.h */, + 11A9219517DBCC7E00DDFD32 /* logger.c */, + 11A9219617DBCC7E00DDFD32 /* logger.h */, ); - name = src; - path = ../src; + name = misc; sourceTree = "<group>"; }; /* End PBXGroup section */