Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IPv6 Address Support in Target Files #70

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

IPv6 Address Support in Target Files #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec6a953
Added option to sleep between connections
skettler Oct 10, 2014
0c885ec
Added option to send RDP handshake before scanning
skettler Oct 10, 2014
c7759ce
Merge remote-tracking branch 'upstream/master'
skettler Oct 13, 2014
bccda90
Merge remote-tracking branch 'upstream/master'
skettler Oct 15, 2014
bfe5815
Only flag SSLv3 as yellow (compatibility issues)
skettler Oct 15, 2014
6ac9b54
Merge branch 'master' of https://github.com/rbsec/sslscan
skettler Nov 27, 2014
0a83cb2
Merge branch 'master' of https://github.com/rbsec/sslscan
Dec 15, 2015
da3f65d
Added support for IPv6 in targets file
Dec 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 66 additions & 79 deletions sslscan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,68 @@ int freeRenegotiationOutput( struct renegotiationOutput *myRenOut )
return true;
}

void parseTarget(char *hostString, struct sslCheckOptions *options) {
int tempInt = 0;
size_t maxSize = strlen(hostString);
options->port = 0;

if (strncmp(hostString, "https://", 8) == 0)
{
// Strip https:// from the start of the hostname
memmove(hostString, hostString + 8, (maxSize - 8));
memset(hostString + (maxSize - 8), 0, 8);
maxSize = strlen(hostString);
}

int squareBrackets = false;
if (hostString[0] == '[')
{
squareBrackets = true;
// skip the square bracket
hostString++;
}

while ((hostString[tempInt] != 0) && ((squareBrackets == true && hostString[tempInt] != ']') || (squareBrackets == false && hostString[tempInt] != ':')))
tempInt++;

if (squareBrackets == true && hostString[tempInt] == ']')
{
hostString[tempInt] = 0;
if (tempInt < maxSize && hostString[tempInt + 1] == ':')
{
tempInt++;
hostString[tempInt] = 0;
}
}
else
hostString[tempInt] = 0;

strncpy(options->host, hostString, sizeof(options->host) - 1);

// Get port (if it exists)...
tempInt++;
if (tempInt < maxSize - 1)
(*options).port = atoi(hostString + tempInt);
else if (options->port == 0) {
if (options->starttls_ftp)
options->port = 21;
if (options->starttls_imap)
options->port = 143;
if (options->starttls_irc)
options->port = 6667;
if (options->starttls_pop3)
options->port = 110;
if (options->starttls_smtp)
options->port = 25;
if (options->starttls_xmpp)
options->port = 5222;
if (options->rdp)
options->port = 3389;
if (options->port == 0)
options->port = 443;
}
}

void tls_reneg_init(struct sslCheckOptions *options)
{
/* Borrowed from tortls.c to dance with OpenSSL on many platforms, with
Expand Down Expand Up @@ -893,10 +955,10 @@ int testRenegotiation(struct sslCheckOptions *options, const SSL_METHOD *sslMeth
{
#endif
// We can't assume that just because the secure renegotiation
// support failed the server doesn't support insecure renegotiations�
// support failed the server doesn't support insecure renegotiations

// assume ssl is connected and error free up to here
//setBlocking(ssl); // this is unnecessary if it is already blocking�
//setBlocking(ssl); // this is unnecessary if it is already blocking
printf_verbose("Attempting SSL_renegotiate(ssl)\n");
SSL_renegotiate(ssl); // Ask to renegotiate the connection
// This hangs when an 'encrypted alert' is sent by the server
Expand Down Expand Up @@ -3055,8 +3117,6 @@ int main(int argc, char *argv[])
struct sslCheckOptions options;
struct sslCipher *sslCipherPointer;
int argLoop;
int tempInt;
int maxSize;
int xmlArg;
int mode = mode_help;
int msec;
Expand Down Expand Up @@ -3304,66 +3364,9 @@ int main(int argc, char *argv[])

// Get host...
// IPv6 [] address parsing by DinoTools/phibos
tempInt = 0;
char *hostString = argv[argLoop];

maxSize = strlen(hostString);

if (strncmp((char*)hostString, "https://", 8) == 0)
{
// Strip https:// from the start of the hostname
memmove(hostString, hostString + 8, (maxSize - 8));
memset(hostString + (maxSize - 8), 0, 8);
maxSize = strlen(hostString);
}

int squareBrackets = false;
if (hostString[0] == '[')
{
squareBrackets = true;
// skip the square bracket
hostString++;
}

while ((hostString[tempInt] != 0) && ((squareBrackets == true && hostString[tempInt] != ']') || (squareBrackets == false && hostString[tempInt] != ':')))
tempInt++;

if (squareBrackets == true && hostString[tempInt] == ']')
{
hostString[tempInt] = 0;
if (tempInt < maxSize && hostString[tempInt + 1] == ':')
{
tempInt++;
hostString[tempInt] = 0;
}
}
else
hostString[tempInt] = 0;

strncpy(options.host, hostString, sizeof(options.host) -1);
parseTarget(argv[argLoop], &options);

// Get port (if it exists)...
tempInt++;
if (tempInt < maxSize - 1)
options.port = atoi(hostString + tempInt);
else if (options.port == 0) {
if (options.starttls_ftp)
options.port = 21;
if (options.starttls_imap)
options.port = 143;
if (options.starttls_irc)
options.port = 6667;
if (options.starttls_pop3)
options.port = 110;
if (options.starttls_smtp)
options.port = 25;
if (options.starttls_xmpp)
options.port = 5222;
if (options.rdp)
options.port = 3389;
if (options.port == 0)
options.port = 443;
}
}

// Not too sure what the user is doing...
Expand Down Expand Up @@ -3524,23 +3527,7 @@ int main(int argc, char *argv[])
if (strlen(line) != 0)
{
// Get host...
tempInt = 0;
while ((line[tempInt] != 0) && (line[tempInt] != ':'))
tempInt++;
line[tempInt] = 0;
strncpy(options.host, line, sizeof(options.host) -1);

// Get port (if it exists)...
tempInt++;
if (strlen(line + tempInt) > 0)
{
options.port = atoi(line + tempInt);
}
// Otherwise assume 443
else
{
options.port = 443;
}
parseTarget(line, &options);

// Test the host...
if (testConnection(&options))
Expand Down
1 change: 1 addition & 0 deletions sslscan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ void tls_reneg_init(struct sslCheckOptions *);
int outputRenegotiation(struct sslCheckOptions *, struct renegotiationOutput *);
struct renegotiationOutput *newRenegotiationOutput(void);
int freeRenegotiationOutput(struct renegotiationOutput *);
void parseTarget(char *, struct sslCheckOptions *);

int testCompression(struct sslCheckOptions *, const SSL_METHOD *);
int testRenegotiation(struct sslCheckOptions *, const SSL_METHOD *);
Expand Down