Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
michael@0 | 2 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 5 | |
michael@0 | 6 | #include "nsCertificatePrincipal.h" |
michael@0 | 7 | |
michael@0 | 8 | NS_IMPL_ISUPPORTS(nsCertificatePrincipal, nsICertificatePrincipal) |
michael@0 | 9 | |
michael@0 | 10 | NS_IMETHODIMP |
michael@0 | 11 | nsCertificatePrincipal::GetFingerprint(nsACString& aFingerprint) |
michael@0 | 12 | { |
michael@0 | 13 | aFingerprint = mFingerprint; |
michael@0 | 14 | return NS_OK; |
michael@0 | 15 | } |
michael@0 | 16 | |
michael@0 | 17 | NS_IMETHODIMP |
michael@0 | 18 | nsCertificatePrincipal::GetSubjectName(nsACString& aSubjectName) |
michael@0 | 19 | { |
michael@0 | 20 | aSubjectName = mSubjectName; |
michael@0 | 21 | return NS_OK; |
michael@0 | 22 | } |
michael@0 | 23 | |
michael@0 | 24 | NS_IMETHODIMP |
michael@0 | 25 | nsCertificatePrincipal::GetPrettyName(nsACString& aPrettyName) |
michael@0 | 26 | { |
michael@0 | 27 | aPrettyName = mPrettyName; |
michael@0 | 28 | return NS_OK; |
michael@0 | 29 | } |
michael@0 | 30 | |
michael@0 | 31 | NS_IMETHODIMP |
michael@0 | 32 | nsCertificatePrincipal::GetCertificate(nsISupports** aCert) |
michael@0 | 33 | { |
michael@0 | 34 | nsCOMPtr<nsISupports> cert = mCert; |
michael@0 | 35 | cert.forget(aCert); |
michael@0 | 36 | return NS_OK; |
michael@0 | 37 | } |
michael@0 | 38 | |
michael@0 | 39 | NS_IMETHODIMP |
michael@0 | 40 | nsCertificatePrincipal::GetHasCertificate(bool* rv) |
michael@0 | 41 | { |
michael@0 | 42 | *rv = true; |
michael@0 | 43 | return NS_OK; |
michael@0 | 44 | } |
michael@0 | 45 | |
michael@0 | 46 | NS_IMETHODIMP |
michael@0 | 47 | nsCertificatePrincipal::Equals(nsICertificatePrincipal* aOther, bool* rv) |
michael@0 | 48 | { |
michael@0 | 49 | nsAutoCString str; |
michael@0 | 50 | aOther->GetFingerprint(str); |
michael@0 | 51 | if (!str.Equals(mFingerprint)) { |
michael@0 | 52 | *rv = false; |
michael@0 | 53 | return NS_OK; |
michael@0 | 54 | } |
michael@0 | 55 | |
michael@0 | 56 | // If either subject name is empty, just let the result stand, but if they're |
michael@0 | 57 | // both non-empty, only claim equality if they're equal. |
michael@0 | 58 | if (!mSubjectName.IsEmpty()) { |
michael@0 | 59 | // Check the other principal's subject name |
michael@0 | 60 | aOther->GetSubjectName(str); |
michael@0 | 61 | *rv = str.Equals(mSubjectName) || str.IsEmpty(); |
michael@0 | 62 | return NS_OK; |
michael@0 | 63 | } |
michael@0 | 64 | |
michael@0 | 65 | *rv = true; |
michael@0 | 66 | return NS_OK; |
michael@0 | 67 | } |