| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/cert/x509_util.h" | 5 #include "net/cert/x509_util.h" |
| 6 #include "net/cert/x509_util_nss.h" | 6 #include "net/cert/x509_util_nss.h" |
| 7 | 7 |
| 8 #include <cert.h> // Must be included before certdb.h | 8 #include <cert.h> // Must be included before certdb.h |
| 9 #include <certdb.h> | 9 #include <certdb.h> |
| 10 #include <cryptohi.h> | 10 #include <cryptohi.h> |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 SECOidTag domain_bound_cert_oid_tag_; | 55 SECOidTag domain_bound_cert_oid_tag_; |
| 56 | 56 |
| 57 DISALLOW_COPY_AND_ASSIGN(DomainBoundCertOIDWrapper); | 57 DISALLOW_COPY_AND_ASSIGN(DomainBoundCertOIDWrapper); |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 DomainBoundCertOIDWrapper::DomainBoundCertOIDWrapper() | 60 DomainBoundCertOIDWrapper::DomainBoundCertOIDWrapper() |
| 61 : domain_bound_cert_oid_tag_(SEC_OID_UNKNOWN) { | 61 : domain_bound_cert_oid_tag_(SEC_OID_UNKNOWN) { |
| 62 // 1.3.6.1.4.1.11129.2.1.6 | 62 // 1.3.6.1.4.1.11129.2.1.6 |
| 63 // (iso.org.dod.internet.private.enterprises.google.googleSecurity. | 63 // (iso.org.dod.internet.private.enterprises.google.googleSecurity. |
| 64 // certificateExtensions.originBoundCertificate) | 64 // certificateExtensions.originBoundCertificate) |
| 65 static const uint8 kObCertOID[] = { | 65 static const uint8 kObCertOID[] = {0x2b, 0x06, 0x01, 0x04, 0x01, |
| 66 0x2b, 0x06, 0x01, 0x04, 0x01, 0xd6, 0x79, 0x02, 0x01, 0x06 | 66 0xd6, 0x79, 0x02, 0x01, 0x06}; |
| 67 }; | |
| 68 SECOidData oid_data; | 67 SECOidData oid_data; |
| 69 memset(&oid_data, 0, sizeof(oid_data)); | 68 memset(&oid_data, 0, sizeof(oid_data)); |
| 70 oid_data.oid.data = const_cast<uint8*>(kObCertOID); | 69 oid_data.oid.data = const_cast<uint8*>(kObCertOID); |
| 71 oid_data.oid.len = sizeof(kObCertOID); | 70 oid_data.oid.len = sizeof(kObCertOID); |
| 72 oid_data.offset = SEC_OID_UNKNOWN; | 71 oid_data.offset = SEC_OID_UNKNOWN; |
| 73 oid_data.desc = "Origin Bound Certificate"; | 72 oid_data.desc = "Origin Bound Certificate"; |
| 74 oid_data.mechanism = CKM_INVALID_MECHANISM; | 73 oid_data.mechanism = CKM_INVALID_MECHANISM; |
| 75 oid_data.supportedExtension = SUPPORTED_CERT_EXTENSION; | 74 oid_data.supportedExtension = SUPPORTED_CERT_EXTENSION; |
| 76 domain_bound_cert_oid_tag_ = SECOID_AddEntry(&oid_data); | 75 domain_bound_cert_oid_tag_ = SECOID_AddEntry(&oid_data); |
| 77 if (domain_bound_cert_oid_tag_ == SEC_OID_UNKNOWN) | 76 if (domain_bound_cert_oid_tag_ == SEC_OID_UNKNOWN) |
| 78 LOG(ERROR) << "OB_CERT OID tag creation failed"; | 77 LOG(ERROR) << "OB_CERT OID tag creation failed"; |
| 79 } | 78 } |
| 80 | 79 |
| 81 // Creates a Certificate object that may be passed to the SignCertificate | 80 // Creates a Certificate object that may be passed to the SignCertificate |
| 82 // method to generate an X509 certificate. | 81 // method to generate an X509 certificate. |
| 83 // Returns NULL if an error is encountered in the certificate creation | 82 // Returns NULL if an error is encountered in the certificate creation |
| 84 // process. | 83 // process. |
| 85 // Caller responsible for freeing returned certificate object. | 84 // Caller responsible for freeing returned certificate object. |
| 86 CERTCertificate* CreateCertificate( | 85 CERTCertificate* CreateCertificate(SECKEYPublicKey* public_key, |
| 87 SECKEYPublicKey* public_key, | 86 const std::string& subject, |
| 88 const std::string& subject, | 87 uint32 serial_number, |
| 89 uint32 serial_number, | 88 base::Time not_valid_before, |
| 90 base::Time not_valid_before, | 89 base::Time not_valid_after) { |
| 91 base::Time not_valid_after) { | |
| 92 // Create info about public key. | 90 // Create info about public key. |
| 93 CERTSubjectPublicKeyInfo* spki = | 91 CERTSubjectPublicKeyInfo* spki = |
| 94 SECKEY_CreateSubjectPublicKeyInfo(public_key); | 92 SECKEY_CreateSubjectPublicKeyInfo(public_key); |
| 95 if (!spki) | 93 if (!spki) |
| 96 return NULL; | 94 return NULL; |
| 97 | 95 |
| 98 // Create the certificate request. | 96 // Create the certificate request. |
| 99 CERTName* subject_name = | 97 CERTName* subject_name = CERT_AsciiToName(const_cast<char*>(subject.c_str())); |
| 100 CERT_AsciiToName(const_cast<char*>(subject.c_str())); | |
| 101 CERTCertificateRequest* cert_request = | 98 CERTCertificateRequest* cert_request = |
| 102 CERT_CreateCertificateRequest(subject_name, spki, NULL); | 99 CERT_CreateCertificateRequest(subject_name, spki, NULL); |
| 103 SECKEY_DestroySubjectPublicKeyInfo(spki); | 100 SECKEY_DestroySubjectPublicKeyInfo(spki); |
| 104 | 101 |
| 105 if (!cert_request) { | 102 if (!cert_request) { |
| 106 PRErrorCode prerr = PR_GetError(); | 103 PRErrorCode prerr = PR_GetError(); |
| 107 LOG(ERROR) << "Failed to create certificate request: " << prerr; | 104 LOG(ERROR) << "Failed to create certificate request: " << prerr; |
| 108 CERT_DestroyName(subject_name); | 105 CERT_DestroyName(subject_name); |
| 109 return NULL; | 106 return NULL; |
| 110 } | 107 } |
| 111 | 108 |
| 112 CERTValidity* validity = CERT_CreateValidity( | 109 CERTValidity* validity = |
| 113 crypto::BaseTimeToPRTime(not_valid_before), | 110 CERT_CreateValidity(crypto::BaseTimeToPRTime(not_valid_before), |
| 114 crypto::BaseTimeToPRTime(not_valid_after)); | 111 crypto::BaseTimeToPRTime(not_valid_after)); |
| 115 if (!validity) { | 112 if (!validity) { |
| 116 PRErrorCode prerr = PR_GetError(); | 113 PRErrorCode prerr = PR_GetError(); |
| 117 LOG(ERROR) << "Failed to create certificate validity object: " << prerr; | 114 LOG(ERROR) << "Failed to create certificate validity object: " << prerr; |
| 118 CERT_DestroyName(subject_name); | 115 CERT_DestroyName(subject_name); |
| 119 CERT_DestroyCertificateRequest(cert_request); | 116 CERT_DestroyCertificateRequest(cert_request); |
| 120 return NULL; | 117 return NULL; |
| 121 } | 118 } |
| 122 CERTCertificate* cert = CERT_CreateCertificate(serial_number, subject_name, | 119 CERTCertificate* cert = CERT_CreateCertificate( |
| 123 validity, cert_request); | 120 serial_number, subject_name, validity, cert_request); |
| 124 if (!cert) { | 121 if (!cert) { |
| 125 PRErrorCode prerr = PR_GetError(); | 122 PRErrorCode prerr = PR_GetError(); |
| 126 LOG(ERROR) << "Failed to create certificate: " << prerr; | 123 LOG(ERROR) << "Failed to create certificate: " << prerr; |
| 127 } | 124 } |
| 128 | 125 |
| 129 // Cleanup for resources used to generate the cert. | 126 // Cleanup for resources used to generate the cert. |
| 130 CERT_DestroyName(subject_name); | 127 CERT_DestroyName(subject_name); |
| 131 CERT_DestroyValidity(validity); | 128 CERT_DestroyValidity(validity); |
| 132 CERT_DestroyCertificateRequest(cert_request); | 129 CERT_DestroyCertificateRequest(cert_request); |
| 133 | 130 |
| 134 return cert; | 131 return cert; |
| 135 } | 132 } |
| 136 | 133 |
| 137 SECOidTag ToSECOid(x509_util::DigestAlgorithm alg) { | 134 SECOidTag ToSECOid(x509_util::DigestAlgorithm alg) { |
| 138 switch (alg) { | 135 switch (alg) { |
| 139 case x509_util::DIGEST_SHA1: | 136 case x509_util::DIGEST_SHA1: |
| 140 return SEC_OID_SHA1; | 137 return SEC_OID_SHA1; |
| 141 case x509_util::DIGEST_SHA256: | 138 case x509_util::DIGEST_SHA256: |
| 142 return SEC_OID_SHA256; | 139 return SEC_OID_SHA256; |
| 143 } | 140 } |
| 144 return SEC_OID_UNKNOWN; | 141 return SEC_OID_UNKNOWN; |
| 145 } | 142 } |
| 146 | 143 |
| 147 // Signs a certificate object, with |key| generating a new X509Certificate | 144 // Signs a certificate object, with |key| generating a new X509Certificate |
| 148 // and destroying the passed certificate object (even when NULL is returned). | 145 // and destroying the passed certificate object (even when NULL is returned). |
| 149 // The logic of this method references SignCert() in NSS utility certutil: | 146 // The logic of this method references SignCert() in NSS utility certutil: |
| 150 // http://mxr.mozilla.org/security/ident?i=SignCert. | 147 // http://mxr.mozilla.org/security/ident?i=SignCert. |
| 151 // Returns true on success or false if an error is encountered in the | 148 // Returns true on success or false if an error is encountered in the |
| 152 // certificate signing process. | 149 // certificate signing process. |
| 153 bool SignCertificate( | 150 bool SignCertificate(CERTCertificate* cert, |
| 154 CERTCertificate* cert, | 151 SECKEYPrivateKey* key, |
| 155 SECKEYPrivateKey* key, | 152 SECOidTag hash_algorithm) { |
| 156 SECOidTag hash_algorithm) { | |
| 157 // |arena| is used to encode the cert. | 153 // |arena| is used to encode the cert. |
| 158 PLArenaPool* arena = cert->arena; | 154 PLArenaPool* arena = cert->arena; |
| 159 SECOidTag algo_id = SEC_GetSignatureAlgorithmOidTag(key->keyType, | 155 SECOidTag algo_id = |
| 160 hash_algorithm); | 156 SEC_GetSignatureAlgorithmOidTag(key->keyType, hash_algorithm); |
| 161 if (algo_id == SEC_OID_UNKNOWN) | 157 if (algo_id == SEC_OID_UNKNOWN) |
| 162 return false; | 158 return false; |
| 163 | 159 |
| 164 SECStatus rv = SECOID_SetAlgorithmID(arena, &cert->signature, algo_id, 0); | 160 SECStatus rv = SECOID_SetAlgorithmID(arena, &cert->signature, algo_id, 0); |
| 165 if (rv != SECSuccess) | 161 if (rv != SECSuccess) |
| 166 return false; | 162 return false; |
| 167 | 163 |
| 168 // Generate a cert of version 3. | 164 // Generate a cert of version 3. |
| 169 *(cert->version.data) = 2; | 165 *(cert->version.data) = 2; |
| 170 cert->version.len = 1; | 166 cert->version.len = 1; |
| 171 | 167 |
| 172 SECItem der = { siBuffer, NULL, 0 }; | 168 SECItem der = {siBuffer, NULL, 0}; |
| 173 | 169 |
| 174 // Use ASN1 DER to encode the cert. | 170 // Use ASN1 DER to encode the cert. |
| 175 void* encode_result = SEC_ASN1EncodeItem( | 171 void* encode_result = SEC_ASN1EncodeItem( |
| 176 NULL, &der, cert, SEC_ASN1_GET(CERT_CertificateTemplate)); | 172 NULL, &der, cert, SEC_ASN1_GET(CERT_CertificateTemplate)); |
| 177 if (!encode_result) | 173 if (!encode_result) |
| 178 return false; | 174 return false; |
| 179 | 175 |
| 180 // Allocate space to contain the signed cert. | 176 // Allocate space to contain the signed cert. |
| 181 SECItem result = { siBuffer, NULL, 0 }; | 177 SECItem result = {siBuffer, NULL, 0}; |
| 182 | 178 |
| 183 // Sign the ASN1 encoded cert and save it to |result|. | 179 // Sign the ASN1 encoded cert and save it to |result|. |
| 184 rv = DerSignData(arena, &result, &der, key, algo_id); | 180 rv = DerSignData(arena, &result, &der, key, algo_id); |
| 185 PORT_Free(der.data); | 181 PORT_Free(der.data); |
| 186 if (rv != SECSuccess) { | 182 if (rv != SECSuccess) { |
| 187 DLOG(ERROR) << "DerSignData: " << PORT_GetError(); | 183 DLOG(ERROR) << "DerSignData: " << PORT_GetError(); |
| 188 return false; | 184 return false; |
| 189 } | 185 } |
| 190 | 186 |
| 191 // Save the signed result to the cert. | 187 // Save the signed result to the cert. |
| 192 cert->derCert = result; | 188 cert->derCert = result; |
| 193 | 189 |
| 194 return true; | 190 return true; |
| 195 } | 191 } |
| 196 | 192 |
| 197 #if defined(USE_NSS) || defined(OS_IOS) | 193 #if defined(USE_NSS) || defined(OS_IOS) |
| 198 // Callback for CERT_DecodeCertPackage(), used in | 194 // Callback for CERT_DecodeCertPackage(), used in |
| 199 // CreateOSCertHandlesFromBytes(). | 195 // CreateOSCertHandlesFromBytes(). |
| 200 SECStatus PR_CALLBACK CollectCertsCallback(void* arg, | 196 SECStatus PR_CALLBACK |
| 201 SECItem** certs, | 197 CollectCertsCallback(void* arg, SECItem** certs, int num_certs) { |
| 202 int num_certs) { | |
| 203 X509Certificate::OSCertHandles* results = | 198 X509Certificate::OSCertHandles* results = |
| 204 reinterpret_cast<X509Certificate::OSCertHandles*>(arg); | 199 reinterpret_cast<X509Certificate::OSCertHandles*>(arg); |
| 205 | 200 |
| 206 for (int i = 0; i < num_certs; ++i) { | 201 for (int i = 0; i < num_certs; ++i) { |
| 207 X509Certificate::OSCertHandle handle = | 202 X509Certificate::OSCertHandle handle = |
| 208 X509Certificate::CreateOSCertHandleFromBytes( | 203 X509Certificate::CreateOSCertHandleFromBytes( |
| 209 reinterpret_cast<char*>(certs[i]->data), certs[i]->len); | 204 reinterpret_cast<char*>(certs[i]->data), certs[i]->len); |
| 210 if (handle) | 205 if (handle) |
| 211 results->push_back(handle); | 206 results->push_back(handle); |
| 212 } | 207 } |
| 213 | 208 |
| 214 return SECSuccess; | 209 return SECSuccess; |
| 215 } | 210 } |
| 216 | 211 |
| 217 typedef scoped_ptr< | 212 typedef scoped_ptr<CERTName, crypto::NSSDestroyer<CERTName, CERT_DestroyName> > |
| 218 CERTName, | 213 ScopedCERTName; |
| 219 crypto::NSSDestroyer<CERTName, CERT_DestroyName> > ScopedCERTName; | |
| 220 | 214 |
| 221 // Create a new CERTName object from its encoded representation. | 215 // Create a new CERTName object from its encoded representation. |
| 222 // |arena| is the allocation pool to use. | 216 // |arena| is the allocation pool to use. |
| 223 // |data| points to a DER-encoded X.509 DistinguishedName. | 217 // |data| points to a DER-encoded X.509 DistinguishedName. |
| 224 // Return a new CERTName pointer on success, or NULL. | 218 // Return a new CERTName pointer on success, or NULL. |
| 225 CERTName* CreateCertNameFromEncoded(PLArenaPool* arena, | 219 CERTName* CreateCertNameFromEncoded(PLArenaPool* arena, |
| 226 const base::StringPiece& data) { | 220 const base::StringPiece& data) { |
| 227 if (!arena) | 221 if (!arena) |
| 228 return NULL; | 222 return NULL; |
| 229 | 223 |
| 230 ScopedCERTName name(PORT_ArenaZNew(arena, CERTName)); | 224 ScopedCERTName name(PORT_ArenaZNew(arena, CERTName)); |
| 231 if (!name.get()) | 225 if (!name.get()) |
| 232 return NULL; | 226 return NULL; |
| 233 | 227 |
| 234 SECItem item; | 228 SECItem item; |
| 235 item.len = static_cast<unsigned int>(data.length()); | 229 item.len = static_cast<unsigned int>(data.length()); |
| 236 item.data = reinterpret_cast<unsigned char*>( | 230 item.data = reinterpret_cast<unsigned char*>(const_cast<char*>(data.data())); |
| 237 const_cast<char*>(data.data())); | |
| 238 | 231 |
| 239 SECStatus rv = SEC_ASN1DecodeItem( | 232 SECStatus rv = SEC_ASN1DecodeItem( |
| 240 arena, name.get(), SEC_ASN1_GET(CERT_NameTemplate), &item); | 233 arena, name.get(), SEC_ASN1_GET(CERT_NameTemplate), &item); |
| 241 if (rv != SECSuccess) | 234 if (rv != SECSuccess) |
| 242 return NULL; | 235 return NULL; |
| 243 | 236 |
| 244 return name.release(); | 237 return name.release(); |
| 245 } | 238 } |
| 246 | 239 |
| 247 #endif // defined(USE_NSS) || defined(OS_IOS) | 240 #endif // defined(USE_NSS) || defined(OS_IOS) |
| (...skipping 25 matching lines...) Expand all Loading... |
| 273 } | 266 } |
| 274 | 267 |
| 275 der_cert->assign(reinterpret_cast<char*>(cert->derCert.data), | 268 der_cert->assign(reinterpret_cast<char*>(cert->derCert.data), |
| 276 cert->derCert.len); | 269 cert->derCert.len); |
| 277 CERT_DestroyCertificate(cert); | 270 CERT_DestroyCertificate(cert); |
| 278 return true; | 271 return true; |
| 279 } | 272 } |
| 280 | 273 |
| 281 bool IsSupportedValidityRange(base::Time not_valid_before, | 274 bool IsSupportedValidityRange(base::Time not_valid_before, |
| 282 base::Time not_valid_after) { | 275 base::Time not_valid_after) { |
| 283 CERTValidity* validity = CERT_CreateValidity( | 276 CERTValidity* validity = |
| 284 crypto::BaseTimeToPRTime(not_valid_before), | 277 CERT_CreateValidity(crypto::BaseTimeToPRTime(not_valid_before), |
| 285 crypto::BaseTimeToPRTime(not_valid_after)); | 278 crypto::BaseTimeToPRTime(not_valid_after)); |
| 286 | 279 |
| 287 if (!validity) | 280 if (!validity) |
| 288 return false; | 281 return false; |
| 289 | 282 |
| 290 CERT_DestroyValidity(validity); | 283 CERT_DestroyValidity(validity); |
| 291 return true; | 284 return true; |
| 292 } | 285 } |
| 293 | 286 |
| 294 bool CreateDomainBoundCertEC(crypto::ECPrivateKey* key, | 287 bool CreateDomainBoundCertEC(crypto::ECPrivateKey* key, |
| 295 DigestAlgorithm alg, | 288 DigestAlgorithm alg, |
| (...skipping 15 matching lines...) Expand all Loading... |
| 311 | 304 |
| 312 // Create opaque handle used to add extensions later. | 305 // Create opaque handle used to add extensions later. |
| 313 void* cert_handle; | 306 void* cert_handle; |
| 314 if ((cert_handle = CERT_StartCertExtensions(cert)) == NULL) { | 307 if ((cert_handle = CERT_StartCertExtensions(cert)) == NULL) { |
| 315 LOG(ERROR) << "Unable to get opaque handle for adding extensions"; | 308 LOG(ERROR) << "Unable to get opaque handle for adding extensions"; |
| 316 CERT_DestroyCertificate(cert); | 309 CERT_DestroyCertificate(cert); |
| 317 return false; | 310 return false; |
| 318 } | 311 } |
| 319 | 312 |
| 320 // Create SECItem for IA5String encoding. | 313 // Create SECItem for IA5String encoding. |
| 321 SECItem domain_string_item = { | 314 SECItem domain_string_item = {siAsciiString, (unsigned char*)domain.data(), |
| 322 siAsciiString, | 315 static_cast<unsigned>(domain.size())}; |
| 323 (unsigned char*)domain.data(), | |
| 324 static_cast<unsigned>(domain.size()) | |
| 325 }; | |
| 326 | 316 |
| 327 // IA5Encode and arena allocate SECItem | 317 // IA5Encode and arena allocate SECItem |
| 328 SECItem* asn1_domain_string = SEC_ASN1EncodeItem( | 318 SECItem* asn1_domain_string = |
| 329 cert->arena, NULL, &domain_string_item, | 319 SEC_ASN1EncodeItem(cert->arena, |
| 330 SEC_ASN1_GET(SEC_IA5StringTemplate)); | 320 NULL, |
| 321 &domain_string_item, |
| 322 SEC_ASN1_GET(SEC_IA5StringTemplate)); |
| 331 if (asn1_domain_string == NULL) { | 323 if (asn1_domain_string == NULL) { |
| 332 LOG(ERROR) << "Unable to get ASN1 encoding for domain in domain_bound_cert" | 324 LOG(ERROR) << "Unable to get ASN1 encoding for domain in domain_bound_cert" |
| 333 " extension"; | 325 " extension"; |
| 334 CERT_DestroyCertificate(cert); | 326 CERT_DestroyCertificate(cert); |
| 335 return false; | 327 return false; |
| 336 } | 328 } |
| 337 | 329 |
| 338 // Add the extension to the opaque handle | 330 // Add the extension to the opaque handle |
| 339 if (CERT_AddExtension( | 331 if (CERT_AddExtension( |
| 340 cert_handle, | 332 cert_handle, |
| 341 DomainBoundCertOIDWrapper::GetInstance()->domain_bound_cert_oid_tag(), | 333 DomainBoundCertOIDWrapper::GetInstance()->domain_bound_cert_oid_tag(), |
| 342 asn1_domain_string, | 334 asn1_domain_string, |
| 343 PR_TRUE, | 335 PR_TRUE, |
| 344 PR_TRUE) != SECSuccess){ | 336 PR_TRUE) != SECSuccess) { |
| 345 LOG(ERROR) << "Unable to add domain bound cert extension to opaque handle"; | 337 LOG(ERROR) << "Unable to add domain bound cert extension to opaque handle"; |
| 346 CERT_DestroyCertificate(cert); | 338 CERT_DestroyCertificate(cert); |
| 347 return false; | 339 return false; |
| 348 } | 340 } |
| 349 | 341 |
| 350 // Copy extension into x509 cert | 342 // Copy extension into x509 cert |
| 351 if (CERT_FinishExtensions(cert_handle) != SECSuccess){ | 343 if (CERT_FinishExtensions(cert_handle) != SECSuccess) { |
| 352 LOG(ERROR) << "Unable to copy extension to X509 cert"; | 344 LOG(ERROR) << "Unable to copy extension to X509 cert"; |
| 353 CERT_DestroyCertificate(cert); | 345 CERT_DestroyCertificate(cert); |
| 354 return false; | 346 return false; |
| 355 } | 347 } |
| 356 | 348 |
| 357 if (!SignCertificate(cert, key->key(), ToSECOid(alg))) { | 349 if (!SignCertificate(cert, key->key(), ToSECOid(alg))) { |
| 358 CERT_DestroyCertificate(cert); | 350 CERT_DestroyCertificate(cert); |
| 359 return false; | 351 return false; |
| 360 } | 352 } |
| 361 | 353 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 376 #else | 368 #else |
| 377 typedef char* (*CERTGetNameFunc)(CERTName* name); | 369 typedef char* (*CERTGetNameFunc)(CERTName* name); |
| 378 #endif | 370 #endif |
| 379 | 371 |
| 380 // TODO(jcampan): add business_category and serial_number. | 372 // TODO(jcampan): add business_category and serial_number. |
| 381 // TODO(wtc): NSS has the CERT_GetOrgName, CERT_GetOrgUnitName, and | 373 // TODO(wtc): NSS has the CERT_GetOrgName, CERT_GetOrgUnitName, and |
| 382 // CERT_GetDomainComponentName functions, but they return only the most | 374 // CERT_GetDomainComponentName functions, but they return only the most |
| 383 // general (the first) RDN. NSS doesn't have a function for the street | 375 // general (the first) RDN. NSS doesn't have a function for the street |
| 384 // address. | 376 // address. |
| 385 static const SECOidTag kOIDs[] = { | 377 static const SECOidTag kOIDs[] = { |
| 386 SEC_OID_AVA_STREET_ADDRESS, | 378 SEC_OID_AVA_STREET_ADDRESS, SEC_OID_AVA_ORGANIZATION_NAME, |
| 387 SEC_OID_AVA_ORGANIZATION_NAME, | 379 SEC_OID_AVA_ORGANIZATIONAL_UNIT_NAME, SEC_OID_AVA_DC}; |
| 388 SEC_OID_AVA_ORGANIZATIONAL_UNIT_NAME, | |
| 389 SEC_OID_AVA_DC }; | |
| 390 | 380 |
| 391 std::vector<std::string>* values[] = { | 381 std::vector<std::string>* values[] = { |
| 392 &principal->street_addresses, | 382 &principal->street_addresses, &principal->organization_names, |
| 393 &principal->organization_names, | 383 &principal->organization_unit_names, &principal->domain_components}; |
| 394 &principal->organization_unit_names, | |
| 395 &principal->domain_components }; | |
| 396 DCHECK_EQ(arraysize(kOIDs), arraysize(values)); | 384 DCHECK_EQ(arraysize(kOIDs), arraysize(values)); |
| 397 | 385 |
| 398 CERTRDN** rdns = name->rdns; | 386 CERTRDN** rdns = name->rdns; |
| 399 for (size_t rdn = 0; rdns[rdn]; ++rdn) { | 387 for (size_t rdn = 0; rdns[rdn]; ++rdn) { |
| 400 CERTAVA** avas = rdns[rdn]->avas; | 388 CERTAVA** avas = rdns[rdn]->avas; |
| 401 for (size_t pair = 0; avas[pair] != 0; ++pair) { | 389 for (size_t pair = 0; avas[pair] != 0; ++pair) { |
| 402 SECOidTag tag = CERT_GetAVATag(avas[pair]); | 390 SECOidTag tag = CERT_GetAVATag(avas[pair]); |
| 403 for (size_t oid = 0; oid < arraysize(kOIDs); ++oid) { | 391 for (size_t oid = 0; oid < arraysize(kOIDs); ++oid) { |
| 404 if (kOIDs[oid] == tag) { | 392 if (kOIDs[oid] == tag) { |
| 405 SECItem* decode_item = CERT_DecodeAVAValue(&avas[pair]->value); | 393 SECItem* decode_item = CERT_DecodeAVAValue(&avas[pair]->value); |
| 406 if (!decode_item) | 394 if (!decode_item) |
| 407 break; | 395 break; |
| 408 // TODO(wtc): Pass decode_item to CERT_RFC1485_EscapeAndQuote. | 396 // TODO(wtc): Pass decode_item to CERT_RFC1485_EscapeAndQuote. |
| 409 std::string value(reinterpret_cast<char*>(decode_item->data), | 397 std::string value(reinterpret_cast<char*>(decode_item->data), |
| 410 decode_item->len); | 398 decode_item->len); |
| 411 values[oid]->push_back(value); | 399 values[oid]->push_back(value); |
| 412 SECITEM_FreeItem(decode_item, PR_TRUE); | 400 SECITEM_FreeItem(decode_item, PR_TRUE); |
| 413 break; | 401 break; |
| 414 } | 402 } |
| 415 } | 403 } |
| 416 } | 404 } |
| 417 } | 405 } |
| 418 | 406 |
| 419 // Get CN, L, S, and C. | 407 // Get CN, L, S, and C. |
| 420 CERTGetNameFunc get_name_funcs[4] = { | 408 CERTGetNameFunc get_name_funcs[4] = {CERT_GetCommonName, CERT_GetLocalityName, |
| 421 CERT_GetCommonName, CERT_GetLocalityName, | 409 CERT_GetStateName, CERT_GetCountryName}; |
| 422 CERT_GetStateName, CERT_GetCountryName }; | |
| 423 std::string* single_values[4] = { | 410 std::string* single_values[4] = { |
| 424 &principal->common_name, &principal->locality_name, | 411 &principal->common_name, &principal->locality_name, |
| 425 &principal->state_or_province_name, &principal->country_name }; | 412 &principal->state_or_province_name, &principal->country_name}; |
| 426 for (size_t i = 0; i < arraysize(get_name_funcs); ++i) { | 413 for (size_t i = 0; i < arraysize(get_name_funcs); ++i) { |
| 427 char* value = get_name_funcs[i](name); | 414 char* value = get_name_funcs[i](name); |
| 428 if (value) { | 415 if (value) { |
| 429 single_values[i]->assign(value); | 416 single_values[i]->assign(value); |
| 430 PORT_Free(value); | 417 PORT_Free(value); |
| 431 } | 418 } |
| 432 } | 419 } |
| 433 } | 420 } |
| 434 | 421 |
| 435 void ParseDate(const SECItem* der_date, base::Time* result) { | 422 void ParseDate(const SECItem* der_date, base::Time* result) { |
| (...skipping 10 matching lines...) Expand all Loading... |
| 446 | 433 |
| 447 void GetSubjectAltName(CERTCertificate* cert_handle, | 434 void GetSubjectAltName(CERTCertificate* cert_handle, |
| 448 std::vector<std::string>* dns_names, | 435 std::vector<std::string>* dns_names, |
| 449 std::vector<std::string>* ip_addrs) { | 436 std::vector<std::string>* ip_addrs) { |
| 450 if (dns_names) | 437 if (dns_names) |
| 451 dns_names->clear(); | 438 dns_names->clear(); |
| 452 if (ip_addrs) | 439 if (ip_addrs) |
| 453 ip_addrs->clear(); | 440 ip_addrs->clear(); |
| 454 | 441 |
| 455 SECItem alt_name; | 442 SECItem alt_name; |
| 456 SECStatus rv = CERT_FindCertExtension(cert_handle, | 443 SECStatus rv = CERT_FindCertExtension( |
| 457 SEC_OID_X509_SUBJECT_ALT_NAME, | 444 cert_handle, SEC_OID_X509_SUBJECT_ALT_NAME, &alt_name); |
| 458 &alt_name); | |
| 459 if (rv != SECSuccess) | 445 if (rv != SECSuccess) |
| 460 return; | 446 return; |
| 461 | 447 |
| 462 PLArenaPool* arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); | 448 PLArenaPool* arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); |
| 463 DCHECK(arena != NULL); | 449 DCHECK(arena != NULL); |
| 464 | 450 |
| 465 CERTGeneralName* alt_name_list; | 451 CERTGeneralName* alt_name_list; |
| 466 alt_name_list = CERT_DecodeAltNameExtension(arena, &alt_name); | 452 alt_name_list = CERT_DecodeAltNameExtension(arena, &alt_name); |
| 467 SECITEM_FreeItem(&alt_name, PR_FALSE); | 453 SECITEM_FreeItem(&alt_name, PR_FALSE); |
| 468 | 454 |
| 469 CERTGeneralName* name = alt_name_list; | 455 CERTGeneralName* name = alt_name_list; |
| 470 while (name) { | 456 while (name) { |
| 471 // DNSName and IPAddress are encoded as IA5String and OCTET STRINGs | 457 // DNSName and IPAddress are encoded as IA5String and OCTET STRINGs |
| 472 // respectively, both of which can be byte copied from | 458 // respectively, both of which can be byte copied from |
| 473 // SECItemType::data into the appropriate output vector. | 459 // SECItemType::data into the appropriate output vector. |
| 474 if (dns_names && name->type == certDNSName) { | 460 if (dns_names && name->type == certDNSName) { |
| 475 dns_names->push_back(std::string( | 461 dns_names->push_back( |
| 476 reinterpret_cast<char*>(name->name.other.data), | 462 std::string(reinterpret_cast<char*>(name->name.other.data), |
| 477 name->name.other.len)); | 463 name->name.other.len)); |
| 478 } else if (ip_addrs && name->type == certIPAddress) { | 464 } else if (ip_addrs && name->type == certIPAddress) { |
| 479 ip_addrs->push_back(std::string( | 465 ip_addrs->push_back( |
| 480 reinterpret_cast<char*>(name->name.other.data), | 466 std::string(reinterpret_cast<char*>(name->name.other.data), |
| 481 name->name.other.len)); | 467 name->name.other.len)); |
| 482 } | 468 } |
| 483 name = CERT_GetNextGeneralName(name); | 469 name = CERT_GetNextGeneralName(name); |
| 484 if (name == alt_name_list) | 470 if (name == alt_name_list) |
| 485 break; | 471 break; |
| 486 } | 472 } |
| 487 PORT_FreeArena(arena, PR_FALSE); | 473 PORT_FreeArena(arena, PR_FALSE); |
| 488 } | 474 } |
| 489 | 475 |
| 490 X509Certificate::OSCertHandles CreateOSCertHandlesFromBytes( | 476 X509Certificate::OSCertHandles CreateOSCertHandlesFromBytes( |
| 491 const char* data, | 477 const char* data, |
| (...skipping 13 matching lines...) Expand all Loading... |
| 505 X509Certificate::OSCertHandle handle = | 491 X509Certificate::OSCertHandle handle = |
| 506 X509Certificate::CreateOSCertHandleFromBytes(data, length); | 492 X509Certificate::CreateOSCertHandleFromBytes(data, length); |
| 507 if (handle) | 493 if (handle) |
| 508 results.push_back(handle); | 494 results.push_back(handle); |
| 509 break; | 495 break; |
| 510 } | 496 } |
| 511 case X509Certificate::FORMAT_PKCS7: { | 497 case X509Certificate::FORMAT_PKCS7: { |
| 512 // Make a copy since CERT_DecodeCertPackage may modify it | 498 // Make a copy since CERT_DecodeCertPackage may modify it |
| 513 std::vector<char> data_copy(data, data + length); | 499 std::vector<char> data_copy(data, data + length); |
| 514 | 500 |
| 515 SECStatus result = CERT_DecodeCertPackage(&data_copy[0], | 501 SECStatus result = CERT_DecodeCertPackage( |
| 516 length, CollectCertsCallback, &results); | 502 &data_copy[0], length, CollectCertsCallback, &results); |
| 517 if (result != SECSuccess) | 503 if (result != SECSuccess) |
| 518 results.clear(); | 504 results.clear(); |
| 519 break; | 505 break; |
| 520 } | 506 } |
| 521 default: | 507 default: |
| 522 NOTREACHED() << "Certificate format " << format << " unimplemented"; | 508 NOTREACHED() << "Certificate format " << format << " unimplemented"; |
| 523 break; | 509 break; |
| 524 } | 510 } |
| 525 | 511 |
| 526 return results; | 512 return results; |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 case ecKey: | 548 case ecKey: |
| 563 *type = X509Certificate::kPublicKeyTypeECDSA; | 549 *type = X509Certificate::kPublicKeyTypeECDSA; |
| 564 break; | 550 break; |
| 565 default: | 551 default: |
| 566 *type = X509Certificate::kPublicKeyTypeUnknown; | 552 *type = X509Certificate::kPublicKeyTypeUnknown; |
| 567 *size_bits = 0; | 553 *size_bits = 0; |
| 568 break; | 554 break; |
| 569 } | 555 } |
| 570 } | 556 } |
| 571 | 557 |
| 572 bool GetIssuersFromEncodedList( | 558 bool GetIssuersFromEncodedList(const std::vector<std::string>& encoded_issuers, |
| 573 const std::vector<std::string>& encoded_issuers, | 559 PLArenaPool* arena, |
| 574 PLArenaPool* arena, | 560 std::vector<CERTName*>* out) { |
| 575 std::vector<CERTName*>* out) { | |
| 576 std::vector<CERTName*> result; | 561 std::vector<CERTName*> result; |
| 577 for (size_t n = 0; n < encoded_issuers.size(); ++n) { | 562 for (size_t n = 0; n < encoded_issuers.size(); ++n) { |
| 578 CERTName* name = CreateCertNameFromEncoded(arena, encoded_issuers[n]); | 563 CERTName* name = CreateCertNameFromEncoded(arena, encoded_issuers[n]); |
| 579 if (name != NULL) | 564 if (name != NULL) |
| 580 result.push_back(name); | 565 result.push_back(name); |
| 581 } | 566 } |
| 582 | 567 |
| 583 if (result.size() == encoded_issuers.size()) { | 568 if (result.size() == encoded_issuers.size()) { |
| 584 out->swap(result); | 569 out->swap(result); |
| 585 return true; | 570 return true; |
| 586 } | 571 } |
| 587 | 572 |
| 588 for (size_t n = 0; n < result.size(); ++n) | 573 for (size_t n = 0; n < result.size(); ++n) |
| 589 CERT_DestroyName(result[n]); | 574 CERT_DestroyName(result[n]); |
| 590 return false; | 575 return false; |
| 591 } | 576 } |
| 592 | 577 |
| 593 | |
| 594 bool IsCertificateIssuedBy(const std::vector<CERTCertificate*>& cert_chain, | 578 bool IsCertificateIssuedBy(const std::vector<CERTCertificate*>& cert_chain, |
| 595 const std::vector<CERTName*>& valid_issuers) { | 579 const std::vector<CERTName*>& valid_issuers) { |
| 596 for (size_t n = 0; n < cert_chain.size(); ++n) { | 580 for (size_t n = 0; n < cert_chain.size(); ++n) { |
| 597 CERTName* cert_issuer = &cert_chain[n]->issuer; | 581 CERTName* cert_issuer = &cert_chain[n]->issuer; |
| 598 for (size_t i = 0; i < valid_issuers.size(); ++i) { | 582 for (size_t i = 0; i < valid_issuers.size(); ++i) { |
| 599 if (CERT_CompareName(valid_issuers[i], cert_issuer) == SECEqual) | 583 if (CERT_CompareName(valid_issuers[i], cert_issuer) == SECEqual) |
| 600 return true; | 584 return true; |
| 601 } | 585 } |
| 602 } | 586 } |
| 603 return false; | 587 return false; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 626 CERT_GetDefaultCertDB())) { | 610 CERT_GetDefaultCertDB())) { |
| 627 base::SStringPrintf(&new_name, "%s #%d", nickname.c_str(), index++); | 611 base::SStringPrintf(&new_name, "%s #%d", nickname.c_str(), index++); |
| 628 temp_nickname = token_name + new_name; | 612 temp_nickname = token_name + new_name; |
| 629 } | 613 } |
| 630 | 614 |
| 631 return new_name; | 615 return new_name; |
| 632 } | 616 } |
| 633 | 617 |
| 634 #endif // defined(USE_NSS) || defined(OS_IOS) | 618 #endif // defined(USE_NSS) || defined(OS_IOS) |
| 635 | 619 |
| 636 } // namespace x509_util | 620 } // namespace x509_util |
| 637 | 621 |
| 638 } // namespace net | 622 } // namespace net |
| OLD | NEW |