bug 807435 - telemetry for ssl key exchange algorithm r=bsmith r=honzab

security/manager/ssl/src/nsNSSCallbacks.cpp

@@ -978,6 +978,15 @@ void HandshakeCallback(PRFileDesc* fd, void* client_data) {
       // 0=ssl3, 1=tls1, 2=tls1.1, 3=tls1.2
       unsigned int versionEnum = channelInfo.protocolVersion & 0xFF;
       Telemetry::Accumulate(Telemetry::SSL_HANDSHAKE_VERSION, versionEnum);
+
+      SSLCipherSuiteInfo cipherInfo;
+      if (SSL_GetCipherSuiteInfo(channelInfo.cipherSuite, &cipherInfo,
+                                 sizeof (cipherInfo)) == SECSuccess) {
+        // keyExchange null=0, rsa=1, dh=2, fortezza=3, ecdh=4
+        Telemetry::Accumulate(Telemetry::SSL_KEY_EXCHANGE_ALGORITHM,
+                              cipherInfo.keaType);
+      }
+      
     }
     infoObject->SetHandshakeCompleted();
   }

toolkit/components/telemetry/Histograms.json

@@ -739,6 +739,11 @@
     "n_buckets": 200,
     "description": "ms elapsed time of OCSP etc.. that failed"
   },
+  "SSL_KEY_EXCHANGE_ALGORITHM": {
+    "kind": "enumerated",
+    "n_values": 16,
+    "description": "SSL Handshake Key Exchange Algorithm (null=0, rsa=1, dh=2, fortezza=3, ecdh=4)"
+  },
   "WEBSOCKETS_HANDSHAKE_TYPE": {
     "kind": "enumerated",
     "n_values": 16,