diff --git a/client-simulation-data.sh b/client-simulation-data.sh
index c15bda4..96d816e 100644
--- a/client-simulation-data.sh
+++ b/client-simulation-data.sh
@@ -15,6 +15,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Android 4.0.4                 ")
 short+=("android_404")
@@ -27,6 +33,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Android 4.1.1                 ")
 short+=("android_411")
@@ -39,6 +51,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Android 4.2.2                 ")
 short+=("android_422")
@@ -51,6 +69,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Android 4.3                   ")
 short+=("android_43")
@@ -63,6 +87,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Android 4.4.2                 ")
 short+=("android_442")
@@ -75,6 +105,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Android 5.0.0                 ")
 short+=("android_500")
@@ -87,6 +123,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Android 6.0                   ")
 short+=("android_60")
@@ -99,6 +141,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Baidu Jan 2015                ")
 short+=("baidu_jan_2015")
@@ -111,6 +159,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("BingBot Dec 2013              ")
 short+=("bingbot_dec_2013")
@@ -123,6 +177,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("BingPreview Dec 2013          ")
 short+=("bingpreview_dec_2013")
@@ -135,6 +195,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("BingPreview Jun 2014          ")
 short+=("bingpreview_jun_2014")
@@ -147,6 +213,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("BingPreview Jan 2015          ")
 short+=("bingpreview_jan_2015")
@@ -159,6 +231,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 27 Win 7               ")
 short+=("chrome_27_win7")
@@ -171,6 +249,12 @@ tlsvers+=("-tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0302")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 28 Win 7               ")
 short+=("chrome_28_win7")
@@ -183,6 +267,12 @@ tlsvers+=("-tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0302")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 29 Win 7               ")
 short+=("chrome_29_win7")
@@ -195,6 +285,12 @@ tlsvers+=("-tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0302")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 30 Win 7               ")
 short+=("chrome_30_win7")
@@ -207,6 +303,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 31 Win 7               ")
 short+=("chrome_31_win7")
@@ -219,6 +321,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 32 Win 7               ")
 short+=("chrome_32_win7")
@@ -231,6 +339,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 33 Win 7               ")
 short+=("chrome_33_win7")
@@ -243,6 +357,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 34 OS X                ")
 short+=("chrome_34_osx")
@@ -255,6 +375,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 35 Win 7               ")
 short+=("chrome_35_win7")
@@ -267,6 +393,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 36 Win 7               ")
 short+=("chrome_36_win7")
@@ -279,6 +411,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 37 OS X                ")
 short+=("chrome_37_osx")
@@ -291,6 +429,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 39 OS X                ")
 short+=("chrome_39_osx")
@@ -303,6 +447,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 40 OS X                ")
 short+=("chrome_40_osx")
@@ -315,6 +465,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 42 OS X                ")
 short+=("chrome_42_osx")
@@ -327,6 +483,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(4096)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 43 OS X                ")
 short+=("chrome_43_osx")
@@ -339,6 +501,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(4096)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 45 OS X                ")
 short+=("chrome_45_osx")
@@ -351,6 +519,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(8192)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 47 OS X                ")
 short+=("chrome_47_osx")
@@ -363,6 +537,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(8192)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 48 OS X                ")
 short+=("chrome_48_osx")
@@ -375,6 +555,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(8192)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 49 Win 7               ")
 short+=("chrome_49_win7")
@@ -387,6 +573,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 50 Win 7               ")
 short+=("chrome_50_win7")
@@ -399,6 +591,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Chrome 51 Win 7               ")
 short+=("chrome_51_win7")
@@ -411,6 +609,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 21 Win 7              ")
 short+=("firefox_21_win7")
@@ -423,6 +627,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 10.0.12 ESR Win 7     ")
 short+=("firefox_10012_esr_win7")
@@ -435,6 +645,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 17.0.7 ESR Win 7      ")
 short+=("firefox_1707_esr_win7")
@@ -447,6 +663,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 24.2.0 ESR Win 7      ")
 short+=("firefox_2420_esr_win7")
@@ -459,6 +681,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 31.3.0 ESR Win 7      ")
 short+=("firefox_3130_esr_win7")
@@ -471,6 +699,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 21 Fedora 19          ")
 short+=("firefox_21_fedora19")
@@ -483,6 +717,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 22 Win 7              ")
 short+=("firefox_22_win7")
@@ -495,6 +735,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 24 Win 7              ")
 short+=("firefox_24_win7")
@@ -507,6 +753,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 26 Win 8              ")
 short+=("firefox_26_win8")
@@ -519,6 +771,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 27 Win 8              ")
 short+=("firefox_27_win8")
@@ -531,6 +789,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 29 OS X               ")
 short+=("firefox_29_osx")
@@ -543,6 +807,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 30 OS X               ")
 short+=("firefox_30_osx")
@@ -555,6 +825,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 31 OS X               ")
 short+=("firefox_31_osx")
@@ -567,6 +843,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 32 OS X               ")
 short+=("firefox_32_osx")
@@ -579,6 +861,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 34 OS X               ")
 short+=("firefox_34_osx")
@@ -591,6 +879,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 35 OS X               ")
 short+=("firefox_35_osx")
@@ -603,6 +897,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 37 OS X               ")
 short+=("firefox_37_osx")
@@ -615,6 +915,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 39 OS X               ")
 short+=("firefox_39_osx")
@@ -627,6 +933,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1023)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 41 OS X               ")
 short+=("firefox_41_osx")
@@ -639,6 +951,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1023)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 42 OS X               ")
 short+=("firefox_42_osx")
@@ -651,6 +969,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1023)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 44 OS X               ")
 short+=("firefox_44_osx")
@@ -663,6 +987,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1023)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 45 Win 7              ")
 short+=("firefox_45_win7")
@@ -675,6 +1005,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1023)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Firefox 46 Win 7              ")
 short+=("firefox_46_win7")
@@ -687,6 +1023,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1023)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Googlebot Oct 2013            ")
 short+=("googlebot_oct_2013")
@@ -699,6 +1041,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Googlebot Jun 2014            ")
 short+=("googlebot_jun_2014")
@@ -711,6 +1059,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Googlebot Feb 2015            ")
 short+=("googlebot_feb_2015")
@@ -723,6 +1077,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 6 XP                       ")
 short+=("ie_6_xp")
@@ -735,6 +1095,12 @@ tlsvers+=("")
 lowest_protocol+=("0x0200")
 highest_protocol+=("0x0300")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 6 XP                       ")
 short+=("ie_6_xp")
@@ -747,6 +1113,12 @@ tlsvers+=("")
 lowest_protocol+=("0x0200")
 highest_protocol+=("0x0300")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 7 Vista                    ")
 short+=("ie_7_vista")
@@ -759,6 +1131,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 8 XP                       ")
 short+=("ie_8_xp")
@@ -771,6 +1149,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 8 XP                       ")
 short+=("ie_8_xp")
@@ -783,6 +1167,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 8 Win 7                    ")
 short+=("ie_8_win7")
@@ -795,6 +1185,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 9 Win 7                    ")
 short+=("ie_9_win7")
@@ -807,6 +1203,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 8-10 Win 7                 ")
 short+=("ie_8-10_win7")
@@ -819,6 +1221,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 8-10 Win 7                 ")
 short+=("ie_8-10_win7")
@@ -831,6 +1239,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(4096)
+minRsaBits+=(-1)
+maxRsaBits+=(16384)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 11 Win 7                   ")
 short+=("ie_11_win7")
@@ -843,6 +1257,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 11 Win 7                   ")
 short+=("ie_11_win7")
@@ -855,6 +1275,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 11 Win 7                   ")
 short+=("ie_11_win7")
@@ -867,6 +1293,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(4096)
+minRsaBits+=(-1)
+maxRsaBits+=(16384)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 11 Win 10 Preview          ")
 short+=("ie_11_win10preview")
@@ -879,6 +1311,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 11 Win 8.1                 ")
 short+=("ie_11_win81")
@@ -891,6 +1329,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 11 Win 8.1                 ")
 short+=("ie_11_win81")
@@ -903,6 +1347,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 11 Win 8.1                 ")
 short+=("ie_11_win81")
@@ -915,6 +1365,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 11 Win 8.1                 ")
 short+=("ie_11_win81")
@@ -927,6 +1383,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(4096)
+minRsaBits+=(-1)
+maxRsaBits+=(16384)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 10 Win Phone 8.0           ")
 short+=("ie_10_winphone80")
@@ -939,6 +1401,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 11 Win Phone 8.1           ")
 short+=("ie_11_winphone81")
@@ -951,6 +1419,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 11 Win Phone 8.1 Update    ")
 short+=("ie_11_winphone81update")
@@ -963,6 +1437,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("IE 11 Win 10                  ")
 short+=("ie_11_win10")
@@ -975,6 +1455,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(4096)
+minRsaBits+=(-1)
+maxRsaBits+=(16384)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Edge 12 Win 10                ")
 short+=("edge_12_win10")
@@ -987,6 +1473,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(4096)
+minRsaBits+=(-1)
+maxRsaBits+=(16384)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Edge 13 Win 10                ")
 short+=("edge_13_win10")
@@ -999,6 +1491,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(4096)
+minRsaBits+=(-1)
+maxRsaBits+=(16384)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Edge 13 Win Phone 10          ")
 short+=("edge_13_winphone10")
@@ -1011,6 +1509,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(1024)
+maxDhBits+=(4096)
+minRsaBits+=(-1)
+maxRsaBits+=(16384)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Java 6u45                     ")
 short+=("java_6u45")
@@ -1022,7 +1526,13 @@ protos+=("-ssl2 -ssl3 -no_tls1_1 -no_tls1_2")
 tlsvers+=("-tls1")
 lowest_protocol+=("0x0200")
 highest_protocol+=("0x0301")
-service+=("HTTP")
+service+=("ANY")
+minDhBits+=(-1)
+maxDhBits+=(1024)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Java 7u25                     ")
 short+=("java_7u25")
@@ -1034,7 +1544,13 @@ protos+=("-no_ssl2 -ssl3 -no_tls1_1 -no_tls1_2")
 tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
-service+=("HTTP")
+service+=("ANY")
+minDhBits+=(-1)
+maxDhBits+=(1024)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Java 8b132                    ")
 short+=("java_8b132")
@@ -1046,7 +1562,13 @@ protos+=("-no_ssl2 -ssl3")
 tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
-service+=("HTTP")
+service+=("ANY")
+minDhBits+=(-1)
+maxDhBits+=(2048)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Java 8u31                     ")
 short+=("java_8u31")
@@ -1058,7 +1580,13 @@ protos+=("-no_ssl2 -no_ssl3")
 tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
-service+=("HTTP")
+service+=("ANY")
+minDhBits+=(-1)
+maxDhBits+=(2048)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("OpenSSL 0.9.8y                ")
 short+=("openssl_098y")
@@ -1070,7 +1598,13 @@ protos+=("-no_ssl2 -ssl3 -no_tls1_1 -no_tls1_2")
 tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
-service+=("HTTP")
+service+=("ANY")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("OpenSSL 1.0.1h                ")
 short+=("openssl_101h")
@@ -1082,7 +1616,13 @@ protos+=("-no_ssl2 -ssl3")
 tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
-service+=("HTTP")
+service+=("ANY")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("OpenSSL 1.0.1l                ")
 short+=("openssl_101l")
@@ -1094,7 +1634,13 @@ protos+=("-no_ssl2 -ssl3")
 tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
-service+=("HTTP")
+service+=("ANY")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("OpenSSL 1.0.2e                ")
 short+=("openssl_102e")
@@ -1106,7 +1652,13 @@ protos+=("-no_ssl2 -ssl3")
 tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
-service+=("HTTP")
+service+=("ANY")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Opera 12.15 Win 7             ")
 short+=("opera_1215_win7")
@@ -1119,6 +1671,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Opera 15 Win 7                ")
 short+=("opera_15_win7")
@@ -1131,6 +1689,12 @@ tlsvers+=("-tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0302")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Opera 16 Win 7                ")
 short+=("opera_16_win7")
@@ -1143,6 +1707,12 @@ tlsvers+=("-tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0302")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(4096)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Opera 17 Win 7                ")
 short+=("opera_17_win7")
@@ -1155,6 +1725,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(4096)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Safari 5 iOS 5.1.1            ")
 short+=("safari_5_ios511")
@@ -1167,6 +1743,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(4096)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Safari 5.1.9 OS X 10.6.8      ")
 short+=("safari_519_osx1068")
@@ -1179,6 +1761,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(4096)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Safari 6 iOS 6.0.1            ")
 short+=("safari_6_ios601")
@@ -1191,6 +1779,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(4096)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Safari 6.0.4 OS X 10.8.4      ")
 short+=("safari_604_osx1084")
@@ -1203,6 +1797,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(4096)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Safari 7 iOS 7.1              ")
 short+=("safari_7_ios71")
@@ -1215,6 +1815,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(4096)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Safari 8 iOS 8.0 Beta         ")
 short+=("safari_8_ios80beta")
@@ -1227,6 +1833,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Safari 7 OS X 10.9            ")
 short+=("safari_7_osx109")
@@ -1239,6 +1851,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(4096)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Safari 8 iOS 8.4              ")
 short+=("safari_8_ios84")
@@ -1251,6 +1869,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(768)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(4096)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Safari 8 OS X 10.10           ")
 short+=("safari_8_osx1010")
@@ -1263,6 +1887,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(768)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(8192)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Safari 9 iOS 9                ")
 short+=("safari_9_ios9")
@@ -1275,6 +1905,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(768)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(8192)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Safari 9 OS X 10.11           ")
 short+=("safari_9_osx1011")
@@ -1287,6 +1923,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0301")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(768)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(8192)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Apple ATS 9 iOS 9             ")
 short+=("apple_ats_9_ios9")
@@ -1299,6 +1941,12 @@ tlsvers+=("-tls1_2")
 lowest_protocol+=("0x0303")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(768)
+maxDhBits+=(-1)
+minRsaBits+=(2048)
+maxRsaBits+=(8192)
+minEcdsaBits+=(256)
+requiresSha2+=(true)
 
 names+=("Tor 17.0.9 Win 7              ")
 short+=("tor_1709_win7")
@@ -1311,6 +1959,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Yahoo Slurp Oct 2013          ")
 short+=("yahoo_slurp_oct_2013")
@@ -1323,6 +1977,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Yahoo Slurp Jun 2014          ")
 short+=("yahoo_slurp_jun_2014")
@@ -1335,6 +1995,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("Yahoo Slurp Jan 2015          ")
 short+=("yahoo_slurp_jan_2015")
@@ -1347,6 +2013,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("YandexBot 3.0                 ")
 short+=("yandexbot_30")
@@ -1359,6 +2031,12 @@ tlsvers+=("")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0300")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("YandexBot May 2014            ")
 short+=("yandexbot_may_2014")
@@ -1371,6 +2049,12 @@ tlsvers+=("-tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0301")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("YandexBot Sep 2014            ")
 short+=("yandexbot_sep_2014")
@@ -1383,6 +2067,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 names+=("YandexBot Jan 2015            ")
 short+=("yandexbot_jan_2015")
@@ -1395,6 +2085,12 @@ tlsvers+=("-tls1_2 -tls1_1 -tls1")
 lowest_protocol+=("0x0300")
 highest_protocol+=("0x0303")
 service+=("HTTP")
+minDhBits+=(-1)
+maxDhBits+=(-1)
+minRsaBits+=(-1)
+maxRsaBits+=(-1)
+minEcdsaBits+=(-1)
+requiresSha2+=(false)
 
 # --- testssl.sh maintained clients ---
 	     
diff --git a/utils/parse_client_ciphers.pl b/utils/parse_client_ciphers.pl
index 31c49b0..3892e46 100755
--- a/utils/parse_client_ciphers.pl
+++ b/utils/parse_client_ciphers.pl
@@ -119,7 +119,25 @@ foreach my $client ( @$ssllabs ) {
 	printf OUT "lowest_protocol+=(\"0x%04x\")\n", $client->{lowestProtocol};
 	printf OUT "highest_protocol+=(\"0x%04x\")\n", $client->{highestProtocol};
 
-	print OUT "service+=(\"HTTP\")\n";
+	if ( lc($client->{name}) eq "java" || lc($client->{name}) eq "openssl" ) {
+		# Java and OpenSSL are generic clients
+		print OUT "service+=(\"ANY\")\n";		
+	} else {
+		# All others are HTTP(s) only
+		print OUT "service+=(\"HTTP\")\n";
+	}
+
+	# Bit size limitations
+	print OUT "minDhBits+=($client->{minDhBits})\n";
+	print OUT "maxDhBits+=($client->{maxDhBits})\n";
+	print OUT "minRsaBits+=($client->{minRsaBits})\n";
+	print OUT "maxRsaBits+=($client->{maxRsaBits})\n";
+	print OUT "minEcdsaBits+=($client->{minEcdsaBits})\n";
+	if ( defined $client->{requiresSha2} && $client->{requiresSha2} ) {
+		print OUT "requiresSha2+=(true)\n";
+	} else {
+		print OUT "requiresSha2+=(false)\n";		
+	}
 
 	print OUT "\n";
 }