upgraded starttls ciphers

cert/server.crt

@@ -1,21 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIIDeDCCAmACCQDV7WFRKm0WPTANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJF
-RTERMA8GA1UECBMISGFyanVtYWExEDAOBgNVBAcTB1RhbGxpbm4xEjAQBgNVBAoT
-CUtyZWF0YSBPVTESMBAGA1UEAxMJbG9jYWxob3N0MSIwIAYJKoZIhvcNAQkBFhNp
-bmZvQGhvb2RpZWNyb3cuY29tMB4XDTEzMDkxODA4MzAzM1oXDTIzMDkxNjA4MzAz
-M1owfjELMAkGA1UEBhMCRUUxETAPBgNVBAgTCEhhcmp1bWFhMRAwDgYDVQQHEwdU
-YWxsaW5uMRIwEAYDVQQKEwlLcmVhdGEgT1UxEjAQBgNVBAMTCWxvY2FsaG9zdDEi
-MCAGCSqGSIb3DQEJARYTaW5mb0Bob29kaWVjcm93LmNvbTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAOGvVN+NV1Ez+WjvErQ5EOG1XNpJyAKqVD1AyMRA
-yDuSyS4GGZeMkwfYFB6pVrwnxoeoBjrSb3VHUyBNsWw32K8K5Bd1qd4WHLyqwENj
-e7TZSTjEaYxqGFfctJYjEBgGrp9k7U8OVxDsaviPddYQHmZDRjVH7/R97Q282bIg
-JEysusCjhUhGelmgkBhNP85bmz8xJjgsxltCzkvYu4PvvcFZoJIyU9M8RaBQMwbU
-2/PHH5BRoHCH+VFCkYJwtvK1ZLcu0rhWOrYQwFYATkzFW+nLkVeyh4+bk6EQSqqr
-OGR7ot25aeH7UeM55ZXuFExMzqPTVqsxU3Pn1/Ou2FE2lvUCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAyxm0bzsUb6vlU3T+pYm17DovffXeDz/OCjU0orxhI+WLRdL5
-ajyOjJU6coWvKOVngZvKxd74+LmTsuA1edDbbWo7S54RN4mH5UhV8oVaZBC/cMg+
-ZG/lG2Y4cVGPlvMxlLoCsCrT6XnwdNNeuB6uN4+e7ixMowktK3K78dtPgbUo8tu0
-7e0WTos6Q/eiknq1hoRSjhfmS0DIdWB2ZXhxr/R2w83rjl1BYVrQIqiTQxsV4PuI
-hEwXKrON8ZQ6WpxooQ5sLM8SDyCQFt3njotjDii1VZ8MeOfW1eTkv5eUU3j+ReK9
-NvsQBYaviYpv+vFYO6THCrciUWR1/Zv/VGAXZA==
------END CERTIFICATE-----
+MIICpDCCAYwCCQCuVLVKVTXnAjANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDEwls
+b2NhbGhvc3QwHhcNMTUwMjEyMTEzMjU4WhcNMjUwMjA5MTEzMjU4WjAUMRIwEAYD
+VQQDEwlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDp
+nlCqHD6hZ+G0SIwcTfYe33ibBMGkB+O3e8+lfwzsMwJPAezXFxe9DiVDevCt4NM5
+Z2gl4QTLuAzFeofSPDRZ8HH7wgglTr3Gy07JPsVEUO8DXJNFdjbK30rmzpIqR6f9
+5sx+ZlH7Tc0PhQWwPOTPQV+ByOuReaswXkSHlRdf/71gd5TGWnSAwC379K6ZKaAJ
+rKzFkuMul3i5fP5f4lXGyTUAKDU2gQ7uVYkL/dYE/swhy7bBWwx3Zd6AtPSBZh9P
+X+OwgfrhT+ZL9JVcL1CHEyX1h+SjaTHU6JiEPGEezvlElmGs1HGB+LCBJvnQbDg0
+BBoMjGv8Mk90uGCeljpRAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABXm8GPdY0sc
+mMUFlgDqFzcevjdGDce0QfboR+M7WDdm512Jz2SbRTgZD/4na42ThODOZz9z1AcM
+zLgx2ZNZzVhBz0odCU4JVhOCEks/OzSyKeGwjIb4JAY7dh+Kju1+6MNfQJ4r1Hza
+SVXH0+JlpJDaJ73NQ2JyfqELmJ1mTcptkA/N6rQWhlzycTBSlfogwf9xawgVPATP
+4AuwgjHl12JI2HVVs1gu65Y3slvaHRCr0B4+Kg1GYNLLcbFcK+NEHrHmPxy9TnTh
+Zwp1dsNQU+Xkylz8IUANWSLHYZOMtN2e5SKIdwTtl5C8YxveuY8YKb1gDExnMraT
+VGXQDqPleug=
+-----END CERTIFICATE-----

cert/server.key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA4a9U341XUTP5aO8StDkQ4bVc2knIAqpUPUDIxEDIO5LJLgYZ
-l4yTB9gUHqlWvCfGh6gGOtJvdUdTIE2xbDfYrwrkF3Wp3hYcvKrAQ2N7tNlJOMRp
-jGoYV9y0liMQGAaun2TtTw5XEOxq+I911hAeZkNGNUfv9H3tDbzZsiAkTKy6wKOF
-SEZ6WaCQGE0/zlubPzEmOCzGW0LOS9i7g++9wVmgkjJT0zxFoFAzBtTb88cfkFGg
-cIf5UUKRgnC28rVkty7SuFY6thDAVgBOTMVb6cuRV7KHj5uToRBKqqs4ZHui3blp
-4ftR4znlle4UTEzOo9NWqzFTc+fX867YUTaW9QIDAQABAoIBAEZSgMrL2uplnJCy
-9gwMQBNklNM77EPQWUFg324vlXTirydVJUJQvjvSe6p2L52fc0Av/gj0K2DK4b8O
-FnvXBwC8Dwi0VELsdvXe6tvUsuZOUn+KzCzBnmY6Ulb6A/jIlD78jul0WXLfiBF9
-ekVCboaE7eqKSN3RIz2Fm/viAg2VqyviFIAwrflvJYdxfTnHNnBLE3JH6LPmgXpp
-0URq8lvWfY5IUxLL8izM1eqVVSdZGZA3X0JsMLPTbKJZ1Irn9+Td9duBPd/UedUl
-Ie9mHRZDdrI3Rmlv+wBWYQsxmWGySm/Gz7onwcuLnYmrGOml12gf2A/67JNso7Fm
-qswMCV0CgYEA8Gu8yD635DFJ5JXNtM7C3FXXgkXfDmacZpb6lhiMgNQ5wlXdVfgz
-xYS7CBKwrY33ZXegTv7I8L0tVJhkaabA6Uoz3heSkgsNX79/ciIFYcwTMYQxhoOS
-J5jt7sKLmZ1TIvMab9yr4dAoRu5l4EzLuqP5NQ2oolIk2lPDTwfGLG8CgYEA8E8k
-4z54O4uMP/FHlf0/NckAIsUYCgT7YfdK/RzorNn1anet8YS/M72srTLbPKSJ+iO2
-c7VFy5CiSd3reJ/z/ugTANhJFqizwItIsn2DQi52KLiwhUgUcsJ6kiSwoXtoFMgx
-l7zu6QtQ/R9+pLA6mXJg/hPjOIR+UQB7MppsrNsCgYAdj4GktWFy40SMoIasZoe7
-A6r9z41/fcpZKtMgxV/xLyby6A/Q1DW5YXqFoZaroDr89Np3HAik4P3D2wDtpJ0v
-kfoSop9Y6Zb5YNhQtjInNipd+j0EpwS/baRDqRP1DUz9jRqBCobvuuJY5lMMYyTh
-i+vGRCmp26PAXHA1NWV+bQKBgQCUmIv5zO4x+9eMzpjygXetvY3M8k0sHOqJKI6B
-N3gVMm3UGQ9BUlGdIAN/0fvJYwFC4QR4RjZTays/O+/YVihdjon5ssR3M3h7bmVU
-odIhgXNlONdGg0zJrcJ3TiK+p/2zJBuudZDSIEJDU09PbP2/Vv/s/MU7dIpbck27
-+8uJkwKBgQDoFvgeei36zBz8KuPHCguD2b7XL2rY5vIQXNVwNVZzZBWRDFtFbCq8
-GTl9oDptq1zR66yLpUkRc5nXu2yeelgF29Q6OTtrEtq0yGsaGOM14Gx2zynOOkpS
-ZiQx7naH0MKL8UBkMCyE0JdX7UFwFEVIqlZ1qEAAhtGfHYD6EmyBuA==
------END RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA6Z5Qqhw+oWfhtEiMHE32Ht94mwTBpAfjt3vPpX8M7DMCTwHs
+1xcXvQ4lQ3rwreDTOWdoJeEEy7gMxXqH0jw0WfBx+8IIJU69xstOyT7FRFDvA1yT
+RXY2yt9K5s6SKken/ebMfmZR+03ND4UFsDzkz0FfgcjrkXmrMF5Eh5UXX/+9YHeU
+xlp0gMAt+/SumSmgCaysxZLjLpd4uXz+X+JVxsk1ACg1NoEO7lWJC/3WBP7MIcu2
+wVsMd2XegLT0gWYfT1/jsIH64U/mS/SVXC9QhxMl9Yfko2kx1OiYhDxhHs75RJZh
+rNRxgfiwgSb50Gw4NAQaDIxr/DJPdLhgnpY6UQIDAQABAoIBAE+tfzWFjJbgJ0ql
+s6Ozs020Sh4U8TZQuonJ4HhBbNbiTtdDgNObPK1uNadeNtgW5fOeIRdKN6iDjVeN
+AuXhQrmqGDYVZ1HSGUfD74sTrZQvRlWPLWtzdhybK6Css41YAyPFo9k4bJ2ZW2b/
+p4EEQ8WsNja9oBpttMU6YYUchGxo1gujN8hmfDdXUQx3k5Xwx4KA68dveJ8GasIt
+d+0Jd/FVwCyyx8HTiF1FF8QZYQeAXxbXJgLBuCsMQJghlcpBEzWkscBR3Ap1U0Zi
+4oat8wrPZGCblaA6rNkRUVbc/+Vw0stnuJ/BLHbPxyBs6w495yBSjBqUWZMvljNz
+m9/aK0ECgYEA9oVIVAd0enjSVIyAZNbw11ElidzdtBkeIJdsxqhmXzeIFZbB39Gd
+bjtAVclVbq5mLsI1j22ER2rHA4Ygkn6vlLghK3ZMPxZa57oJtmL3oP0RvOjE4zRV
+dzKexNGo9gU/x9SQbuyOmuauvAYhXZxeLpv+lEfsZTqqrvPUGeBiEQcCgYEA8poG
+WVnykWuTmCe0bMmvYDsWpAEiZnFLDaKcSbz3O7RMGbPy1cypmqSinIYUpURBT/WY
+wVPAGtjkuTXtd1Cy58m7PqziB7NNWMcsMGj+lWrTPZ6hCHIBcAImKEPpd+Y9vGJX
+oatFJguqAGOz7rigBq6iPfeQOCWpmprNAuah++cCgYB1gcybOT59TnA7mwlsh8Qf
+bm+tSllnin2A3Y0dGJJLmsXEPKtHS7x2Gcot2h1d98V/TlWHe5WNEUmx1VJbYgXB
+pw8wj2ACxl4ojNYqWPxegaLd4DpRbtW6Tqe9e47FTnU7hIggR6QmFAWAXI+09l8y
+amssNShqjE9lu5YDi6BTKwKBgQCuIlKGViLfsKjrYSyHnajNWPxiUhIgGBf4PI0T
+/Jg1ea/aDykxv0rKHnw9/5vYGIsM2st/kR7l5mMecg/2Qa145HsLfMptHo1ZOPWF
+9gcuttPTegY6aqKPhGthIYX2MwSDMM+X0ri6m0q2JtqjclAjG7yG4CjbtGTt/UlE
+WMlSZwKBgQDslGeLUnkW0bsV5EG3AKRUyPKz/6DVNuxaIRRhOeWVKV101claqXAT
+wXOpdKrvkjZbT4AzcNrlGtRl3l7dEVXTu+dN7/ZieJRu7zaStlAQZkIyP9O3DdQ3
+rIcetQpfrJ1cAqz6Ng0pD0mh77vQ13WG1BBmDFa2A9BuzLoBituf4g==
+-----END RSA PRIVATE KEY-----

lib/mock-client.js

@@ -74,7 +74,8 @@ function runClientMockup(port, host, commands, debug, callback) {
                 socket.removeAllListeners("data");
                 var secureSocket = tls.connect({
                     rejectUnauthorized: false,
-                    socket: socket
+                    socket: socket,
+                    host: host
                 }, function() {
                     ignore_data = false;
 

lib/server.js

@@ -878,6 +878,11 @@ IMAPConnection.prototype.onNotify = function(notification) {
 IMAPConnection.prototype.upgradeConnection = function(callback) {
     this.upgrading = true;
 
+    this.options.credentials.ciphers = this.options.credentials.ciphers || "ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS";
+    if (!("honorCipherOrder" in this.options.credentials)) {
+        this.options.credentials.honorCipherOrder = true;
+    }
+
     var secureContext = tls.createSecureContext(this.options.credentials);
     var socketOptions = {
         secureContext: secureContext,