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

cygwin fixes added #6

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

cygwin fixes added #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5bf66bf
Fixed handling of certificate serial numbers
Feb 3, 2011
4899cf8
Add proper serial output for XML output mode
Feb 3, 2011
937f9a9
Fix typo instances of 'preferred'
Feb 4, 2011
c6c6c87
Fix gcc flags order for building under Cygwin
Feb 4, 2011
8940623
Added 'cygwin' target to Makefile so that Windows users can easily co…
Feb 4, 2011
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
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CFLAGS=-I/usr/local/ssl/include/ -I/usr/local/ssl/include/openssl/
LDFLAGS=-L/usr/local/ssl/lib/

all:
gcc -o sslscan -g -Wall $(CFLAGS) $(LDFLAGS) -lssl -lcrypto $(SRCS)
gcc -g -Wall ${LDFLAGS} ${SRCS} ${CFLAGS} -lssl -lcrypto -o sslscan

install:
cp sslscan $(BINPATH)
Expand All @@ -18,6 +18,9 @@ uninstall:
clean:
rm -f sslscan

cygwin:
gcc -g -Wall -L/lib/ sslscan.c -I/usr/include/ -I/usr/inlcude/openssl/ -lssl -lcrypto -o sslscan

newopenssl:
gcc -o sslscan -g -Wall -I /tmp/openssl-1.0.0a/ -L/tmp/openssl-1.0.0a/ sslscan.c /tmp/openssl-1.0.0a/libssl.a /tmp/openssl-1.0.0a/libcrypto.a

Expand Down
96 changes: 74 additions & 22 deletions sslscan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ int testCipher(struct sslCheckOptions *options, struct sslCipher *sslCipherPoint
}


// Test for prefered ciphers
// Test for preferred ciphers
int defaultCipher(struct sslCheckOptions *options, SSL_METHOD *sslMethod)
{
// Variables...
Expand Down Expand Up @@ -1362,25 +1362,77 @@ int getCertificate(struct sslCheckOptions *options)
fprintf(options->xmlOutput, " <version>%lu</version>\n", tempLong);
}

// Cert Serial No.
if (!(X509_FLAG_COMPAT & X509_FLAG_NO_SERIAL))
{
tempLong = ASN1_INTEGER_get(X509_get_serialNumber(x509Cert));
if (tempLong < 1)
{
// XXX TODO: We overflow here sometimes; bad juju
// Serial Number: -4294967295
printf(" Serial Number: -%lu\n", tempLong);
if (options->xmlOutput != 0)
fprintf(options->xmlOutput, " <serial>-%lu</serial>\n", tempLong);
}
else
{
printf(" Serial Number: %lu\n", tempLong);
if (options->xmlOutput != 0)
fprintf(options->xmlOutput, " <serial>%lu</serial>\n", tempLong);
}
}
// Cert Serial No. - Code adapted from OpenSSL's crypto/asn1/t_x509.c
if (!(X509_FLAG_COMPAT & X509_FLAG_NO_SERIAL))
{
ASN1_INTEGER *bs;
BIO *bp;
BIO *xml_bp;
bp = BIO_new_fp(stdout, BIO_NOCLOSE);
if (options->xmlOutput != 0)
xml_bp = BIO_new_fp(options->xmlOutput, BIO_NOCLOSE);
long l;
int i;
const char *neg;
bs=X509_get_serialNumber(x509Cert);

if (BIO_write(bp," Serial Number:",18) <= 0)
return(1);

if (bs->length <= 4)
{
l=ASN1_INTEGER_get(bs);
if (l < 0)
{
l= -l;
neg="-";
}
else
neg="";
if (BIO_printf(bp," %s%lu (%s0x%lx)\n",neg,l,neg,l) <= 0)
return(1);
if (options->xmlOutput != 0)
if (BIO_printf(xml_bp," <serial>%s%lu (%s0x%lx)</serial>\n",neg,l,neg,l) <= 0)
return(1);
}
else
{
neg=(bs->type == V_ASN1_NEG_INTEGER)?" (Negative)":"";
if (BIO_printf(bp,"%1s%s","",neg) <= 0)
return(1);

if (options->xmlOutput != 0)
if (BIO_printf(xml_bp," <serial>") <= 0)
return(1);

for (i=0; i<bs->length; i++)
{
if (BIO_printf(bp,"%02x%c",bs->data[i],
((i+1 == bs->length)?'\n':':')) <= 0)
return(1);
if (options->xmlOutput != 0) {
if (i+1 == bs->length)
{
if (BIO_printf(xml_bp,"%02x",bs->data[i]) <= 0)
return(1);
}
else
{
if (BIO_printf(xml_bp,"%02x%c",bs->data[i], ':') <= 0)
return(1);
}
}
}

if (options->xmlOutput != 0)
if (BIO_printf(xml_bp,"</serial>\n") <= 0)
return(1);

}
if(NULL != bp)
BIO_free(bp);
// We don't free the xml_bp because it will be used in the future
}

// Signature Algo...
if (!(X509_FLAG_COMPAT & X509_FLAG_NO_SIGNAME))
Expand Down Expand Up @@ -1728,7 +1780,7 @@ int testHost(struct sslCheckOptions *options)

if (status == true)
{
// Test prefered ciphers...
// Test preferred ciphers...
printf("\n %sPrefered Server Cipher(s):%s\n", COL_BLUE, RESET);
if (options->pout == true)
printf("|| Version || Bits || Cipher ||\n");
Expand Down Expand Up @@ -1967,7 +2019,7 @@ int main(int argc, char *argv[])
printf("%s%s%s\n", COL_BLUE, program_banner, RESET);
printf("SSLScan is a fast SSL port scanner. SSLScan connects to SSL\n");
printf("ports and determines what ciphers are supported, which are\n");
printf("the servers prefered ciphers, which SSL protocols are\n");
printf("the servers preferred ciphers, which SSL protocols are\n");
printf("supported and returns the SSL certificate. Client\n");
printf("certificates / private key can be configured and output is\n");
printf("to text / XML.\n\n");
Expand Down