diff -ur --exclude=.svn --exclude=.git sslscan/Makefile sslscan-mine/Makefile
--- sslscan/Makefile	2014-02-21 12:51:22.411829422 -0600
+++ sslscan-mine/Makefile	2014-02-21 11:44:34.563934830 -0600
@@ -1,9 +1,11 @@
 SRCS = sslscan.c
-BINPATH = /usr/bin/
-MANPATH = /usr/share/man/
+BINPATH = /home/bryan/Toobin/
+MANPATH = /home/bryan/Tooman/
+CFLAGS = -I/home/bryan/Tools/openssl/include/
+LDFLAGS = -L/home/bryan/Tools/openssl/lib/
 
 all:
-	gcc -g -Wall -lssl -o sslscan $(SRCS) $(LDFLAGS) $(CFLAGS)
+	gcc -g -Wall -o sslscan $(SRCS) $(CFLAGS) $(LDFLAGS) -lssl -lcrypto -ldl
 
 install:
 	cp sslscan $(BINPATH)
diff -ur --exclude=.svn --exclude=.git sslscan/sslscan.c sslscan-mine/sslscan.c
--- sslscan/sslscan.c	2014-02-21 12:51:22.411829422 -0600
+++ sslscan-mine/sslscan.c	2014-02-21 12:01:56.403907507 -0600
@@ -82,6 +82,8 @@
 #define ssl_v2 1
 #define ssl_v3 2
 #define tls_v1 3
+#define tls_v1_1 4
+#define tls_v1_2 5
 
 // Colour Console Output...
 #if !defined(WIN32)
@@ -226,7 +228,7 @@
 }
 
 // Adds Ciphers to the Cipher List structure
-int populateCipherList(struct sslCheckOptions *options, SSL_METHOD *sslMethod)
+int populateCipherList(struct sslCheckOptions *options, const SSL_METHOD *sslMethod)
 {
 	// Variables...
 	int returnCode = true;
@@ -685,9 +687,9 @@
 						if (options->quiet == false)
 						{
 							if (options->pout == true)
-								printf("SSLv2 || ");
+								printf("SSLv2   || ");
 							else
-								printf("SSLv2  ");
+								printf("SSLv2    ");
 						}
 					}
 					else if (sslCipherPointer->sslMethod == SSLv3_client_method())
@@ -697,23 +699,61 @@
 						if (options->quiet == false)
 						{
 							if (options->pout == true)
-								printf("SSLv3 || ");
+								printf("SSLv3   || ");
 							else
-								printf("SSLv3  ");
+								printf("SSLv3    ");
 						}
 					}
-					else
+					else if (sslCipherPointer->sslMethod == TLSv1_client_method())
+					{
+						if (options->xmlOutput != 0)
+							fprintf(options->xmlOutput, "TLSv1.0\" bits=\"");
+						if (options->quiet == false)
+						{
+							if (options->pout == true)
+								printf("TLSv1.0 || ");
+							else
+								printf("TLSv1.0  ");
+						}
+					}
+					else if (sslCipherPointer->sslMethod == TLSv1_1_client_method())
+					{
+						if (options->xmlOutput != 0)
+							fprintf(options->xmlOutput, "TLSv1.1\" bits=\"");
+						if (options->quiet == false)
+						{
+							if (options->pout == true)
+								printf("TLSv1.1 || ");
+							else
+								printf("TLSv1.1  ");
+						}
+					}
+					else if (sslCipherPointer->sslMethod == TLSv1_2_client_method())
 					{
 						if (options->xmlOutput != 0)
-							fprintf(options->xmlOutput, "TLSv1\" bits=\"");
+							fprintf(options->xmlOutput, "TLSv1.2\" bits=\"");
 						if (options->quiet == false)
 						{
 							if (options->pout == true)
-								printf("TLSv1 || ");
+								printf("TLSv1.2 || ");
 							else
-								printf("TLSv1  ");
+								printf("TLSv1.2  ");
 						}
 					}
+                    else
+                    {
+						if (options->xmlOutput != 0)
+							fprintf(options->xmlOutput, "Unknown\" bits=\"");
+						if (options->quiet == false)
+						{
+							if (options->pout == true)
+								printf("Unknown || ");
+							else
+								printf("Unknown  ");
+						}
+
+                    }
+
 					if (options->quiet == false)
 					{
 						if (options->pout == true)
@@ -769,7 +809,7 @@
 }
 
 // Check if the server supports renegotiation
-int testRenegotiation(struct sslCheckOptions *options, SSL_METHOD *sslMethod)
+int testRenegotiation(struct sslCheckOptions *options, const SSL_METHOD *sslMethod)
 {
 	// Variables...
 	int cipherStatus;
@@ -916,7 +956,7 @@
 
 
 // Test for prefered ciphers
-int defaultCipher(struct sslCheckOptions *options, SSL_METHOD *sslMethod)
+int defaultCipher(struct sslCheckOptions *options, const SSL_METHOD *sslMethod)
 {
 	// Variables...
 	int cipherStatus;
@@ -1482,7 +1522,7 @@
 
 	if (options->quiet == false)
 	{
-		printf("\n%sTesting SSL server %s (%s) on port %d%s\n\n", COL_GREEN, options->host, inet_ntoa(options->serverAddress.sin_addr), options->port, RESET);
+		printf("\n%sTesting SSL server %s on port %d%s\n\n", COL_GREEN, options->host, options->port, RESET);
 	}
 
 	// XML Output...
@@ -1512,6 +1552,10 @@
 					status = defaultCipher(options, SSLv3_client_method());
 				if (status != false)
 					status = defaultCipher(options, TLSv1_client_method());
+				if (status != false)
+					status = defaultCipher(options, TLSv1_1_client_method());
+				if (status != false)
+					status = defaultCipher(options, TLSv1_2_client_method());
 				break;
 			case ssl_v2:
 				status = defaultCipher(options, SSLv2_client_method());
@@ -1522,6 +1566,12 @@
 			case tls_v1:
 				status = defaultCipher(options, TLSv1_client_method());
 				break;
+			case tls_v1_1:
+				status = defaultCipher(options, TLSv1_1_client_method());
+				break;
+			case tls_v1_2:
+				status = defaultCipher(options, TLSv1_2_client_method());
+				break;
 		}
 	}
 
@@ -1584,8 +1634,8 @@
 	}
 
 	// XML Output...
-	if (options->xmlOutput != 0)
-		fprintf(options->xmlOutput, " </ssltest>\n");
+	// if (options->xmlOutput != 0)
+		// fprintf(options->xmlOutput, " </ssltest>\n");
 
 	// Return status...
 	return status;
@@ -1683,6 +1733,14 @@
 		// TLS v1 only...
 		else if (strcmp("--tls1", argv[argLoop]) == 0)
 			options.sslVersion = tls_v1;
+		
+        // TLS v1.1 only...
+		else if (strcmp("--tls1.1", argv[argLoop]) == 0)
+			options.sslVersion = tls_v1_1;
+        
+        // TLS v1.2 only...
+		else if (strcmp("--tls1.2", argv[argLoop]) == 0)
+			options.sslVersion = tls_v1_2;
 
 		// SSL Bugs...
 		else if (strcmp("--bugs", argv[argLoop]) == 0)
@@ -1764,6 +1822,8 @@
 			printf("  %s--ssl2%s               Only check SSLv2 ciphers.\n", COL_GREEN, RESET);
 			printf("  %s--ssl3%s               Only check SSLv3 ciphers.\n", COL_GREEN, RESET);
 			printf("  %s--tls1%s               Only check TLSv1 ciphers.\n", COL_GREEN, RESET);
+			printf("  %s--tls1\.1%s             Only check TLSv1.1 ciphers.\n", COL_GREEN, RESET);
+			printf("  %s--tls1\.2%s             Only check TLSv1.2 ciphers.\n", COL_GREEN, RESET);
 			printf("  %s--pk=<file>%s          A file containing the private key or\n", COL_GREEN, RESET);
 			printf("                       a PKCS#12  file containing a private\n");
 			printf("                       key/certificate pair (as produced by\n");
@@ -1802,6 +1862,8 @@
 					populateCipherList(&options, SSLv2_client_method());
 					populateCipherList(&options, SSLv3_client_method());
 					populateCipherList(&options, TLSv1_client_method());
+                    populateCipherList(&options, TLSv1_1_client_method());
+                    populateCipherList(&options, TLSv1_2_client_method());
 					break;
 				case ssl_v2:
 					populateCipherList(&options, SSLv2_client_method());
@@ -1812,6 +1874,12 @@
 				case tls_v1:
 					populateCipherList(&options, TLSv1_client_method());
 					break;
+				case tls_v1_1:
+					populateCipherList(&options, TLSv1_1_client_method());
+					break;
+				case tls_v1_2:
+					populateCipherList(&options, TLSv1_2_client_method());
+					break;
 			}
 
 			// Do the testing...
