Left: | ||
Right: |
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 /* License to copy and use this software is granted provided that it is | 4 /* License to copy and use this software is granted provided that it is |
5 * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface | 5 * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface |
6 * (Cryptoki)" in all material mentioning or referencing this software. | 6 * (Cryptoki)" in all material mentioning or referencing this software. |
7 | 7 |
8 * License is also granted to make and use derivative works provided that | 8 * License is also granted to make and use derivative works provided that |
9 * such works are identified as "derived from the RSA Security Inc. PKCS #11 | 9 * such works are identified as "derived from the RSA Security Inc. PKCS #11 |
10 * Cryptographic Token Interface (Cryptoki)" in all material mentioning or | 10 * Cryptographic Token Interface (Cryptoki)" in all material mentioning or |
(...skipping 1619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1630 CK_BYTE_PTR pIVServer; | 1630 CK_BYTE_PTR pIVServer; |
1631 } CK_SSL3_KEY_MAT_OUT; | 1631 } CK_SSL3_KEY_MAT_OUT; |
1632 | 1632 |
1633 typedef CK_SSL3_KEY_MAT_OUT CK_PTR CK_SSL3_KEY_MAT_OUT_PTR; | 1633 typedef CK_SSL3_KEY_MAT_OUT CK_PTR CK_SSL3_KEY_MAT_OUT_PTR; |
1634 | 1634 |
1635 | 1635 |
1636 typedef struct CK_SSL3_KEY_MAT_PARAMS { | 1636 typedef struct CK_SSL3_KEY_MAT_PARAMS { |
1637 CK_ULONG ulMacSizeInBits; | 1637 CK_ULONG ulMacSizeInBits; |
1638 CK_ULONG ulKeySizeInBits; | 1638 CK_ULONG ulKeySizeInBits; |
1639 CK_ULONG ulIVSizeInBits; | 1639 CK_ULONG ulIVSizeInBits; |
1640 CK_BBOOL bIsExport; | |
mt
2016/03/02 19:37:31
Can't remove this these. Just annotate this and t
ttaubert
2016/03/03 10:56:49
Done.
| |
1641 CK_SSL3_RANDOM_DATA RandomInfo; | 1640 CK_SSL3_RANDOM_DATA RandomInfo; |
1642 CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial; | 1641 CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial; |
1643 } CK_SSL3_KEY_MAT_PARAMS; | 1642 } CK_SSL3_KEY_MAT_PARAMS; |
1644 | 1643 |
1645 typedef CK_SSL3_KEY_MAT_PARAMS CK_PTR CK_SSL3_KEY_MAT_PARAMS_PTR; | 1644 typedef CK_SSL3_KEY_MAT_PARAMS CK_PTR CK_SSL3_KEY_MAT_PARAMS_PTR; |
1646 | 1645 |
1647 /* CK_TLS_PRF_PARAMS is new for version 2.20 */ | 1646 /* CK_TLS_PRF_PARAMS is new for version 2.20 */ |
1648 typedef struct CK_TLS_PRF_PARAMS { | 1647 typedef struct CK_TLS_PRF_PARAMS { |
1649 CK_BYTE_PTR pSeed; | 1648 CK_BYTE_PTR pSeed; |
1650 CK_ULONG ulSeedLen; | 1649 CK_ULONG ulSeedLen; |
(...skipping 12 matching lines...) Expand all Loading... | |
1663 CK_MECHANISM_TYPE prfHashMechanism; | 1662 CK_MECHANISM_TYPE prfHashMechanism; |
1664 } CK_TLS12_MASTER_KEY_DERIVE_PARAMS; | 1663 } CK_TLS12_MASTER_KEY_DERIVE_PARAMS; |
1665 | 1664 |
1666 typedef CK_TLS12_MASTER_KEY_DERIVE_PARAMS CK_PTR \ | 1665 typedef CK_TLS12_MASTER_KEY_DERIVE_PARAMS CK_PTR \ |
1667 CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR; | 1666 CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR; |
1668 | 1667 |
1669 typedef struct CK_TLS12_KEY_MAT_PARAMS { | 1668 typedef struct CK_TLS12_KEY_MAT_PARAMS { |
1670 CK_ULONG ulMacSizeInBits; | 1669 CK_ULONG ulMacSizeInBits; |
1671 CK_ULONG ulKeySizeInBits; | 1670 CK_ULONG ulKeySizeInBits; |
1672 CK_ULONG ulIVSizeInBits; | 1671 CK_ULONG ulIVSizeInBits; |
1673 CK_BBOOL bIsExport; /* Unused. Must be set to CK_FALSE. */ | |
1674 CK_SSL3_RANDOM_DATA RandomInfo; | 1672 CK_SSL3_RANDOM_DATA RandomInfo; |
1675 CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial; | 1673 CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial; |
1676 CK_MECHANISM_TYPE prfHashMechanism; | 1674 CK_MECHANISM_TYPE prfHashMechanism; |
1677 } CK_TLS12_KEY_MAT_PARAMS; | 1675 } CK_TLS12_KEY_MAT_PARAMS; |
1678 | 1676 |
1679 typedef CK_TLS12_KEY_MAT_PARAMS CK_PTR CK_TLS12_KEY_MAT_PARAMS_PTR; | 1677 typedef CK_TLS12_KEY_MAT_PARAMS CK_PTR CK_TLS12_KEY_MAT_PARAMS_PTR; |
1680 | 1678 |
1681 typedef struct CK_TLS_KDF_PARAMS { | 1679 typedef struct CK_TLS_KDF_PARAMS { |
1682 CK_MECHANISM_TYPE prfMechanism; | 1680 CK_MECHANISM_TYPE prfMechanism; |
1683 CK_BYTE_PTR pLabel; | 1681 CK_BYTE_PTR pLabel; |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1733 } CK_WTLS_KEY_MAT_OUT; | 1731 } CK_WTLS_KEY_MAT_OUT; |
1734 | 1732 |
1735 typedef CK_WTLS_KEY_MAT_OUT CK_PTR CK_WTLS_KEY_MAT_OUT_PTR; | 1733 typedef CK_WTLS_KEY_MAT_OUT CK_PTR CK_WTLS_KEY_MAT_OUT_PTR; |
1736 | 1734 |
1737 typedef struct CK_WTLS_KEY_MAT_PARAMS { | 1735 typedef struct CK_WTLS_KEY_MAT_PARAMS { |
1738 CK_MECHANISM_TYPE DigestMechanism; | 1736 CK_MECHANISM_TYPE DigestMechanism; |
1739 CK_ULONG ulMacSizeInBits; | 1737 CK_ULONG ulMacSizeInBits; |
1740 CK_ULONG ulKeySizeInBits; | 1738 CK_ULONG ulKeySizeInBits; |
1741 CK_ULONG ulIVSizeInBits; | 1739 CK_ULONG ulIVSizeInBits; |
1742 CK_ULONG ulSequenceNumber; | 1740 CK_ULONG ulSequenceNumber; |
1743 CK_BBOOL bIsExport; | |
1744 CK_WTLS_RANDOM_DATA RandomInfo; | 1741 CK_WTLS_RANDOM_DATA RandomInfo; |
1745 CK_WTLS_KEY_MAT_OUT_PTR pReturnedKeyMaterial; | 1742 CK_WTLS_KEY_MAT_OUT_PTR pReturnedKeyMaterial; |
1746 } CK_WTLS_KEY_MAT_PARAMS; | 1743 } CK_WTLS_KEY_MAT_PARAMS; |
1747 | 1744 |
1748 typedef CK_WTLS_KEY_MAT_PARAMS CK_PTR CK_WTLS_KEY_MAT_PARAMS_PTR; | 1745 typedef CK_WTLS_KEY_MAT_PARAMS CK_PTR CK_WTLS_KEY_MAT_PARAMS_PTR; |
1749 | 1746 |
1750 /* CMS is new for version 2.20 */ | 1747 /* CMS is new for version 2.20 */ |
1751 typedef struct CK_CMS_SIG_PARAMS { | 1748 typedef struct CK_CMS_SIG_PARAMS { |
1752 CK_OBJECT_HANDLE certificateHandle; | 1749 CK_OBJECT_HANDLE certificateHandle; |
1753 CK_MECHANISM_PTR pSigningMechanism; | 1750 CK_MECHANISM_PTR pSigningMechanism; |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1837 /* stuff that for historic reasons is in this header file but should have | 1834 /* stuff that for historic reasons is in this header file but should have |
1838 * been in pkcs11n.h */ | 1835 * been in pkcs11n.h */ |
1839 #define CKK_INVALID_KEY_TYPE 0xffffffff | 1836 #define CKK_INVALID_KEY_TYPE 0xffffffff |
1840 | 1837 |
1841 #include "pkcs11n.h" | 1838 #include "pkcs11n.h" |
1842 | 1839 |
1843 /* undo packing */ | 1840 /* undo packing */ |
1844 #include "pkcs11u.h" | 1841 #include "pkcs11u.h" |
1845 | 1842 |
1846 #endif | 1843 #endif |
OLD | NEW |