diff options
| author | Kai Engert <kaie@kuix.de> | 2016-04-29 14:01:49 +0200 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2016-04-29 14:01:49 +0200 |
| commit | 15c420308fcf93e1dc8127baa49cfef57726e99b (patch) | |
| tree | c411ec8b5a978f96d2d31688427291170d79547b /cmd/selfserv | |
| parent | 7680987ade02f84b6a2ec083870171ce0eccdbbf (diff) | |
| download | nss-hg-15c420308fcf93e1dc8127baa49cfef57726e99b.tar.gz | |
Bug 1247021, Backed out changeset 487a06b963f7, r=martin.thomson
Diffstat (limited to 'cmd/selfserv')
| -rw-r--r-- | cmd/selfserv/selfserv.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cmd/selfserv/selfserv.c b/cmd/selfserv/selfserv.c index dc7cb4973..9a1572837 100644 --- a/cmd/selfserv/selfserv.c +++ b/cmd/selfserv/selfserv.c @@ -412,11 +412,6 @@ printSecurityInfo(PRFileDesc *fd) result = SSL_GetCipherSuiteInfo(channel.cipherSuite, &suite, sizeof suite); if (result == SECSuccess) { - const char *EMSUsed = "?"; - if (SSL_CHANNEL_INFO_FIELD_EXISTS(channel, extendedMasterSecretUsed)) { - EMSUsed = SSL_CHANNEL_INFO_FIELD_GET(channel, extendedMasterSecretUsed) ? - "Yes": "No"; - } FPRINTF(stderr, "selfserv: SSL version %d.%d using %d-bit %s with %d-bit %s MAC\n", channel.protocolVersion >> 8, channel.protocolVersion & 0xff, @@ -428,7 +423,7 @@ printSecurityInfo(PRFileDesc *fd) channel.authKeyBits, suite.authAlgorithmName, channel.keaKeyBits, suite.keaTypeName, channel.compressionMethodName, - EMSUsed); + channel.extendedMasterSecretUsed ? "Yes" : "No"); } } if (verbose) { |