OLD | NEW |
1 /* ***** BEGIN LICENSE BLOCK ***** | 1 /* ***** BEGIN LICENSE BLOCK ***** |
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
3 * | 3 * |
4 * The contents of this file are subject to the Mozilla Public License Version | 4 * The contents of this file are subject to the Mozilla Public License Version |
5 * 1.1 (the "License"); you may not use this file except in compliance with | 5 * 1.1 (the "License"); you may not use this file except in compliance with |
6 * the License. You may obtain a copy of the License at | 6 * the License. You may obtain a copy of the License at |
7 * http://www.mozilla.org/MPL/ | 7 * http://www.mozilla.org/MPL/ |
8 * | 8 * |
9 * Software distributed under the License is distributed on an "AS IS" basis, | 9 * Software distributed under the License is distributed on an "AS IS" basis, |
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
767 crldp = CERT_DecodeCRLDistributionPoints(arena.get(), extension_data); | 767 crldp = CERT_DecodeCRLDistributionPoints(arena.get(), extension_data); |
768 if (!crldp || !crldp->distPoints) { | 768 if (!crldp || !crldp->distPoints) { |
769 rv = l10n_util::GetStringUTF8(IDS_CERT_EXTENSION_DUMP_ERROR); | 769 rv = l10n_util::GetStringUTF8(IDS_CERT_EXTENSION_DUMP_ERROR); |
770 return rv; | 770 return rv; |
771 } | 771 } |
772 | 772 |
773 for (points = crldp->distPoints; *points; ++points) { | 773 for (points = crldp->distPoints; *points; ++points) { |
774 point = *points; | 774 point = *points; |
775 switch (point->distPointType) { | 775 switch (point->distPointType) { |
776 case generalName: | 776 case generalName: |
777 rv += ProcessGeneralName(arena.get(), point->distPoint.fullName); | 777 // generalName is a typo in upstream NSS; fullName is actually a |
| 778 // GeneralNames (SEQUENCE OF GeneralName). See Mozilla Bug #615100. |
| 779 rv += ProcessGeneralNames(arena.get(), point->distPoint.fullName); |
778 break; | 780 break; |
779 case relativeDistinguishedName: | 781 case relativeDistinguishedName: |
780 rv += ProcessRDN(&point->distPoint.relativeName); | 782 rv += ProcessRDN(&point->distPoint.relativeName); |
781 break; | 783 break; |
782 } | 784 } |
783 if (point->reasons.len) { | 785 if (point->reasons.len) { |
784 rv += ' '; | 786 rv += ' '; |
785 comma = false; | 787 comma = false; |
786 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(reason_string_map); ++i) { | 788 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(reason_string_map); ++i) { |
787 if (point->reasons.data[0] & reason_string_map[i].reason) { | 789 if (point->reasons.data[0] & reason_string_map[i].reason) { |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1040 if (trust.HasAnyCA()) | 1042 if (trust.HasAnyCA()) |
1041 return net::CA_CERT; | 1043 return net::CA_CERT; |
1042 if (trust.HasPeer(PR_TRUE, PR_FALSE, PR_FALSE)) | 1044 if (trust.HasPeer(PR_TRUE, PR_FALSE, PR_FALSE)) |
1043 return net::SERVER_CERT; | 1045 return net::SERVER_CERT; |
1044 if (CERT_IsCACert(cert, NULL)) | 1046 if (CERT_IsCACert(cert, NULL)) |
1045 return net::CA_CERT; | 1047 return net::CA_CERT; |
1046 return net::UNKNOWN_CERT; | 1048 return net::UNKNOWN_CERT; |
1047 } | 1049 } |
1048 | 1050 |
1049 } // namespace mozilla_security_manager | 1051 } // namespace mozilla_security_manager |
OLD | NEW |