diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 16:32:52 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 16:32:52 +0100 |
| commit | 0dca00b282fb06ec1512bccafd32e0a919242208 (patch) | |
| tree | 1f443869475eb32a8a8babfdf68b74b6d4d601cb /security/manager/ssl/PublicKeyPinningService.h | |
| parent | 76fe52eb81db323ceaa8396de39b76efbce1c25e (diff) | |
| parent | 0b6d9a47051be9ef4d064c6f7c60717da91d0bc2 (diff) | |
| download | UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.gz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.lz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.xz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'security/manager/ssl/PublicKeyPinningService.h')
| -rw-r--r-- | security/manager/ssl/PublicKeyPinningService.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/manager/ssl/PublicKeyPinningService.h b/security/manager/ssl/PublicKeyPinningService.h index f42376b52..09fdd8474 100644 --- a/security/manager/ssl/PublicKeyPinningService.h +++ b/security/manager/ssl/PublicKeyPinningService.h @@ -31,8 +31,7 @@ public: const char* hostname, mozilla::pkix::Time time, bool enforceTestMode, - /*out*/ bool& chainHasValidPins, - /*optional out*/ PinningTelemetryInfo* pinningTelemetryInfo); + /*out*/ bool& chainHasValidPins); /** * Sets chainMatchesPinset to true if there is any intersection between the * certificate list and the pins specified in the aSHA256keys array. |