| 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 /* | 5 /* |
| 6 * builtins/constants.c | 6 * builtins/constants.c |
| 7 * | 7 * |
| 8 * Identification and other constants, all collected here in one place. | 8 * Identification and other constants, all collected here in one place. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef NSSBASET_H | 11 #ifndef NSSBASET_H |
| 12 #include "nssbaset.h" | 12 #include "nssbaset.h" |
| 13 #endif /* NSSBASET_H */ | 13 #endif /* NSSBASET_H */ |
| 14 | 14 |
| 15 #ifndef NSSCKT_H | 15 #ifndef NSSCKT_H |
| 16 #include "nssckt.h" | 16 #include "nssckt.h" |
| 17 #endif /* NSSCKT_H */ | 17 #endif /* NSSCKT_H */ |
| 18 | 18 |
| 19 #ifndef NSSCKBI_H | 19 #ifndef NSSCKBI_H |
| 20 #include "nssckbi.h" | 20 #include "nssckbi.h" |
| 21 #endif /* NSSCKBI_H */ | 21 #endif /* NSSCKBI_H */ |
| 22 | 22 |
| 23 const CK_VERSION | 23 const CK_VERSION |
| 24 nss_builtins_CryptokiVersion = { | 24 nss_builtins_CryptokiVersion = { |
| 25 » » NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR, | 25 NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR, |
| 26 » » NSS_BUILTINS_CRYPTOKI_VERSION_MINOR }; | 26 NSS_BUILTINS_CRYPTOKI_VERSION_MINOR |
| 27 }; |
| 27 | 28 |
| 28 const CK_VERSION | 29 const CK_VERSION |
| 29 nss_builtins_LibraryVersion = { | 30 nss_builtins_LibraryVersion = { |
| 30 » NSS_BUILTINS_LIBRARY_VERSION_MAJOR, | 31 NSS_BUILTINS_LIBRARY_VERSION_MAJOR, |
| 31 » NSS_BUILTINS_LIBRARY_VERSION_MINOR}; | 32 NSS_BUILTINS_LIBRARY_VERSION_MINOR |
| 33 }; |
| 32 | 34 |
| 33 const CK_VERSION | 35 const CK_VERSION |
| 34 nss_builtins_HardwareVersion = { | 36 nss_builtins_HardwareVersion = { |
| 35 » NSS_BUILTINS_HARDWARE_VERSION_MAJOR, | 37 NSS_BUILTINS_HARDWARE_VERSION_MAJOR, |
| 36 » NSS_BUILTINS_HARDWARE_VERSION_MINOR }; | 38 NSS_BUILTINS_HARDWARE_VERSION_MINOR |
| 39 }; |
| 37 | 40 |
| 38 const CK_VERSION | 41 const CK_VERSION |
| 39 nss_builtins_FirmwareVersion = { | 42 nss_builtins_FirmwareVersion = { |
| 40 » NSS_BUILTINS_FIRMWARE_VERSION_MAJOR, | 43 NSS_BUILTINS_FIRMWARE_VERSION_MAJOR, |
| 41 » NSS_BUILTINS_FIRMWARE_VERSION_MINOR }; | 44 NSS_BUILTINS_FIRMWARE_VERSION_MINOR |
| 45 }; |
| 42 | 46 |
| 43 const NSSUTF8 | 47 const NSSUTF8 |
| 44 nss_builtins_ManufacturerID[] = { "Mozilla Foundation" }; | 48 nss_builtins_ManufacturerID[] = { "Mozilla Foundation" }; |
| 45 | 49 |
| 46 const NSSUTF8 | 50 const NSSUTF8 |
| 47 nss_builtins_LibraryDescription[] = { "NSS Builtin Object Cryptoki Module" }; | 51 nss_builtins_LibraryDescription[] = { "NSS Builtin Object Cryptoki Module" }
; |
| 48 | 52 |
| 49 const NSSUTF8 | 53 const NSSUTF8 |
| 50 nss_builtins_SlotDescription[] = { "NSS Builtin Objects" }; | 54 nss_builtins_SlotDescription[] = { "NSS Builtin Objects" }; |
| 51 | 55 |
| 52 const NSSUTF8 | 56 const NSSUTF8 |
| 53 nss_builtins_TokenLabel[] = { "Builtin Object Token" }; | 57 nss_builtins_TokenLabel[] = { "Builtin Object Token" }; |
| 54 | 58 |
| 55 const NSSUTF8 | 59 const NSSUTF8 |
| 56 nss_builtins_TokenModel[] = { "1" }; | 60 nss_builtins_TokenModel[] = { "1" }; |
| 57 | 61 |
| 58 /* should this be e.g. the certdata.txt RCS revision number? */ | 62 /* should this be e.g. the certdata.txt RCS revision number? */ |
| 59 const NSSUTF8 | 63 const NSSUTF8 |
| 60 nss_builtins_TokenSerialNumber[] = { "1" }; | 64 nss_builtins_TokenSerialNumber[] = { "1" }; |
| 61 | |
| OLD | NEW |