| OLD | NEW |
| 1 /* This Source Code Form is subject to the terms of the Mozilla Public | 1 /* This Source Code Form is subject to the terms of the Mozilla Public |
| 2 * License, v. 2.0. If a copy of the MPL was not distributed with this | 2 * License, v. 2.0. If a copy of the MPL was not distributed with this |
| 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
| 4 | 4 |
| 5 #include "plarena.h" | 5 #include "plarena.h" |
| 6 #include "seccomon.h" | 6 #include "seccomon.h" |
| 7 #include "secitem.h" | 7 #include "secitem.h" |
| 8 #include "secoidt.h" | 8 #include "secoidt.h" |
| 9 #include "secasn1.h" | 9 #include "secasn1.h" |
| 10 #include "secder.h" | 10 #include "secder.h" |
| (...skipping 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1604 "\x50\x61\x72\x69\x73\x31\x10\x30\x0E\x06\x03" | 1604 "\x50\x61\x72\x69\x73\x31\x10\x30\x0E\x06\x03" |
| 1605 "\x55\x04\x0A\x13\x07\x50\x4D\x2F\x53\x47\x44" | 1605 "\x55\x04\x0A\x13\x07\x50\x4D\x2F\x53\x47\x44" |
| 1606 "\x4E\x31\x0E\x30\x0C\x06\x03\x55\x04\x0B\x13" | 1606 "\x4E\x31\x0E\x30\x0C\x06\x03\x55\x04\x0B\x13" |
| 1607 "\x05\x44\x43\x53\x53\x49\x31\x0E\x30\x0C\x06" | 1607 "\x05\x44\x43\x53\x53\x49\x31\x0E\x30\x0C\x06" |
| 1608 "\x03\x55\x04\x03\x13\x05\x49\x47\x43\x2F\x41" | 1608 "\x03\x55\x04\x03\x13\x05\x49\x47\x43\x2F\x41" |
| 1609 "\x31\x23\x30\x21\x06\x09\x2A\x86\x48\x86\xF7" | 1609 "\x31\x23\x30\x21\x06\x09\x2A\x86\x48\x86\xF7" |
| 1610 "\x0D\x01\x09\x01\x16\x14\x69\x67\x63\x61\x40" | 1610 "\x0D\x01\x09\x01\x16\x14\x69\x67\x63\x61\x40" |
| 1611 "\x73\x67\x64\x6E\x2E\x70\x6D\x2E\x67\x6F\x75" | 1611 "\x73\x67\x64\x6E\x2E\x70\x6D\x2E\x67\x6F\x75" |
| 1612 "\x76\x2E\x66\x72"; | 1612 "\x76\x2E\x66\x72"; |
| 1613 | 1613 |
| 1614 const SECItem anssi_subject = {0, (char *) rawANSSISubject, | 1614 const SECItem anssi_subject = {0, (unsigned char *) rawANSSISubject, |
| 1615 sizeof(rawANSSISubject)-1}; | 1615 sizeof(rawANSSISubject)-1}; |
| 1616 const SECItem permitFranceGovNC = {0, (char *) constraintFranceGov, | 1616 const SECItem permitFranceGovNC = {0, (unsigned char *) constraintFranceGov, |
| 1617 sizeof(constraintFranceGov)-1}; | 1617 sizeof(constraintFranceGov)-1}; |
| 1618 | 1618 |
| 1619 if (SECITEM_ItemsAreEqual(&cert->derSubject, &anssi_subject)) { | 1619 if (SECITEM_ItemsAreEqual(&cert->derSubject, &anssi_subject)) { |
| 1620 SECStatus rv; | 1620 SECStatus rv; |
| 1621 rv = SECITEM_CopyItem(NULL, extensions, &permitFranceGovNC); | 1621 rv = SECITEM_CopyItem(NULL, extensions, &permitFranceGovNC); |
| 1622 return rv; | 1622 return rv; |
| 1623 } | 1623 } |
| 1624 PORT_SetError(SEC_ERROR_EXTENSION_NOT_FOUND); | 1624 PORT_SetError(SEC_ERROR_EXTENSION_NOT_FOUND); |
| 1625 return SECFailure; | 1625 return SECFailure; |
| 1626 } | 1626 } |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1961 break; | 1961 break; |
| 1962 } | 1962 } |
| 1963 list->name = cert_CombineNamesLists(list->name, name); | 1963 list->name = cert_CombineNamesLists(list->name, name); |
| 1964 list->len++; | 1964 list->len++; |
| 1965 done: | 1965 done: |
| 1966 PZ_Unlock(list->lock); | 1966 PZ_Unlock(list->lock); |
| 1967 } | 1967 } |
| 1968 return; | 1968 return; |
| 1969 } | 1969 } |
| 1970 #endif | 1970 #endif |
| OLD | NEW |