| 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 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 800 // GeneralNames (SEQUENCE OF GeneralName). See Mozilla Bug #615100. | 800 // GeneralNames (SEQUENCE OF GeneralName). See Mozilla Bug #615100. |
| 801 rv += ProcessGeneralNames(arena.get(), point->distPoint.fullName); | 801 rv += ProcessGeneralNames(arena.get(), point->distPoint.fullName); |
| 802 break; | 802 break; |
| 803 case relativeDistinguishedName: | 803 case relativeDistinguishedName: |
| 804 rv += ProcessRDN(&point->distPoint.relativeName); | 804 rv += ProcessRDN(&point->distPoint.relativeName); |
| 805 break; | 805 break; |
| 806 } | 806 } |
| 807 if (point->reasons.len) { | 807 if (point->reasons.len) { |
| 808 rv += ' '; | 808 rv += ' '; |
| 809 comma = false; | 809 comma = false; |
| 810 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(reason_string_map); ++i) { | 810 for (size_t i = 0; i < arraysize(reason_string_map); ++i) { |
| 811 if (point->reasons.data[0] & reason_string_map[i].reason) { | 811 if (point->reasons.data[0] & reason_string_map[i].reason) { |
| 812 if (comma) | 812 if (comma) |
| 813 rv += ','; | 813 rv += ','; |
| 814 rv += l10n_util::GetStringUTF8(reason_string_map[i].string_id); | 814 rv += l10n_util::GetStringUTF8(reason_string_map[i].string_id); |
| 815 comma = true; | 815 comma = true; |
| 816 } | 816 } |
| 817 } | 817 } |
| 818 rv += '\n'; | 818 rv += '\n'; |
| 819 } | 819 } |
| 820 if (point->crlIssuer) { | 820 if (point->crlIssuer) { |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 928 static const MaskIdPair usage_string_map[] = { | 928 static const MaskIdPair usage_string_map[] = { |
| 929 {NS_CERT_TYPE_SSL_CLIENT, IDS_CERT_USAGE_SSL_CLIENT}, | 929 {NS_CERT_TYPE_SSL_CLIENT, IDS_CERT_USAGE_SSL_CLIENT}, |
| 930 {NS_CERT_TYPE_SSL_SERVER, IDS_CERT_USAGE_SSL_SERVER}, | 930 {NS_CERT_TYPE_SSL_SERVER, IDS_CERT_USAGE_SSL_SERVER}, |
| 931 {NS_CERT_TYPE_EMAIL, IDS_CERT_EXT_NS_CERT_TYPE_EMAIL}, | 931 {NS_CERT_TYPE_EMAIL, IDS_CERT_EXT_NS_CERT_TYPE_EMAIL}, |
| 932 {NS_CERT_TYPE_OBJECT_SIGNING, IDS_CERT_USAGE_OBJECT_SIGNER}, | 932 {NS_CERT_TYPE_OBJECT_SIGNING, IDS_CERT_USAGE_OBJECT_SIGNER}, |
| 933 {NS_CERT_TYPE_SSL_CA, IDS_CERT_USAGE_SSL_CA}, | 933 {NS_CERT_TYPE_SSL_CA, IDS_CERT_USAGE_SSL_CA}, |
| 934 {NS_CERT_TYPE_EMAIL_CA, IDS_CERT_EXT_NS_CERT_TYPE_EMAIL_CA}, | 934 {NS_CERT_TYPE_EMAIL_CA, IDS_CERT_EXT_NS_CERT_TYPE_EMAIL_CA}, |
| 935 {NS_CERT_TYPE_OBJECT_SIGNING_CA, IDS_CERT_USAGE_OBJECT_SIGNER}, | 935 {NS_CERT_TYPE_OBJECT_SIGNING_CA, IDS_CERT_USAGE_OBJECT_SIGNER}, |
| 936 }; | 936 }; |
| 937 return ProcessBitStringExtension(extension_data, usage_string_map, | 937 return ProcessBitStringExtension(extension_data, usage_string_map, |
| 938 ARRAYSIZE_UNSAFE(usage_string_map), '\n'); | 938 arraysize(usage_string_map), '\n'); |
| 939 } | 939 } |
| 940 | 940 |
| 941 static const MaskIdPair key_usage_string_map[] = { | 941 static const MaskIdPair key_usage_string_map[] = { |
| 942 {KU_DIGITAL_SIGNATURE, IDS_CERT_X509_KEY_USAGE_SIGNING}, | 942 {KU_DIGITAL_SIGNATURE, IDS_CERT_X509_KEY_USAGE_SIGNING}, |
| 943 {KU_NON_REPUDIATION, IDS_CERT_X509_KEY_USAGE_NONREP}, | 943 {KU_NON_REPUDIATION, IDS_CERT_X509_KEY_USAGE_NONREP}, |
| 944 {KU_KEY_ENCIPHERMENT, IDS_CERT_X509_KEY_USAGE_ENCIPHERMENT}, | 944 {KU_KEY_ENCIPHERMENT, IDS_CERT_X509_KEY_USAGE_ENCIPHERMENT}, |
| 945 {KU_DATA_ENCIPHERMENT, IDS_CERT_X509_KEY_USAGE_DATA_ENCIPHERMENT}, | 945 {KU_DATA_ENCIPHERMENT, IDS_CERT_X509_KEY_USAGE_DATA_ENCIPHERMENT}, |
| 946 {KU_KEY_AGREEMENT, IDS_CERT_X509_KEY_USAGE_KEY_AGREEMENT}, | 946 {KU_KEY_AGREEMENT, IDS_CERT_X509_KEY_USAGE_KEY_AGREEMENT}, |
| 947 {KU_KEY_CERT_SIGN, IDS_CERT_X509_KEY_USAGE_CERT_SIGNER}, | 947 {KU_KEY_CERT_SIGN, IDS_CERT_X509_KEY_USAGE_CERT_SIGNER}, |
| 948 {KU_CRL_SIGN, IDS_CERT_X509_KEY_USAGE_CRL_SIGNER}, | 948 {KU_CRL_SIGN, IDS_CERT_X509_KEY_USAGE_CRL_SIGNER}, |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1074 return net::USER_CERT; | 1074 return net::USER_CERT; |
| 1075 if ((all_flags & CERTDB_VALID_CA) || CERT_IsCACert(cert, NULL)) | 1075 if ((all_flags & CERTDB_VALID_CA) || CERT_IsCACert(cert, NULL)) |
| 1076 return net::CA_CERT; | 1076 return net::CA_CERT; |
| 1077 // TODO(mattm): http://crbug.com/128633. | 1077 // TODO(mattm): http://crbug.com/128633. |
| 1078 if (trust.sslFlags & CERTDB_TERMINAL_RECORD) | 1078 if (trust.sslFlags & CERTDB_TERMINAL_RECORD) |
| 1079 return net::SERVER_CERT; | 1079 return net::SERVER_CERT; |
| 1080 return net::OTHER_CERT; | 1080 return net::OTHER_CERT; |
| 1081 } | 1081 } |
| 1082 | 1082 |
| 1083 } // namespace mozilla_security_manager | 1083 } // namespace mozilla_security_manager |
| OLD | NEW |