diff options
| -rw-r--r-- | cryptography/hazmat/bindings/commoncrypto/binding.py | 6 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/commoncrypto/secimport.py (renamed from cryptography/hazmat/bindings/commoncrypto/security.py) | 69 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/commoncrypto/secitem.py | 40 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/commoncrypto/seckey.py | 34 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/commoncrypto/seckeychain.py | 36 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/commoncrypto/sectransform.py | 79 |
6 files changed, 195 insertions, 69 deletions
diff --git a/cryptography/hazmat/bindings/commoncrypto/binding.py b/cryptography/hazmat/bindings/commoncrypto/binding.py index 689988b6..ee7378ad 100644 --- a/cryptography/hazmat/bindings/commoncrypto/binding.py +++ b/cryptography/hazmat/bindings/commoncrypto/binding.py @@ -30,7 +30,11 @@ class Binding(object): "common_hmac", "common_key_derivation", "common_cryptor", - "security", + "secimport", + "secitem", + "seckey", + "seckeychain", + "sectransform", ] ffi = None diff --git a/cryptography/hazmat/bindings/commoncrypto/security.py b/cryptography/hazmat/bindings/commoncrypto/secimport.py index 3c27c641..5358d2e7 100644 --- a/cryptography/hazmat/bindings/commoncrypto/security.py +++ b/cryptography/hazmat/bindings/commoncrypto/secimport.py @@ -14,29 +14,16 @@ from __future__ import absolute_import, division, print_function INCLUDES = """ -#include <Security/Security.h> -#include <Security/SecKey.h> -#include <Security/SecEncryptTransform.h> +#include <Security/SecImportExport.h> """ TYPES = """ -typedef ... *SecKeyRef; -typedef ... *SecKeychainRef; typedef ... *SecAccessRef; -typedef ... *SecTransformRef; -typedef uint32_t SecPadding; CFStringRef kSecImportExportPassphrase; CFStringRef kSecImportExportKeychain; CFStringRef kSecImportExportAccess; -enum { - kSecPaddingNone = 0, - kSecPaddingPKCS1 = 1, - /* The following perform ASN.1 + PKCS1 padding */ - kSecPaddingPKCS1SHA1 = 0x8002, -}; - typedef uint32_t SecExternalItemType; enum { kSecItemTypeUnknown, @@ -89,48 +76,6 @@ typedef struct { CFArrayRef keyAttributes; } SecItemImportExportKeyParameters; - -CFStringRef kSecEncryptionMode; -CFStringRef kSecEncryptKey; -CFStringRef kSecIVKey; -CFStringRef kSecModeCBCKey; -CFStringRef kSecModeCFBKey; -CFStringRef kSecModeECBKey; -CFStringRef kSecModeNoneKey; -CFStringRef kSecModeOFBKey; -CFStringRef kSecOAEPEncodingParametersAttributeName; -CFStringRef kSecPaddingKey; -CFStringRef kSecPaddingNoneKey; -CFStringRef kSecPaddingOAEPKey; -CFStringRef kSecPaddingPKCS1Key; -CFStringRef kSecPaddingPKCS5Key; -CFStringRef kSecPaddingPKCS7Key; - -const CFStringRef kSecTransformInputAttributeName; -const CFStringRef kSecTransformOutputAttributeName; -const CFStringRef kSecTransformDebugAttributeName; -const CFStringRef kSecTransformTransformName; -const CFStringRef kSecTransformAbortAttributeName; - -CFStringRef kSecInputIsAttributeName; -CFStringRef kSecInputIsPlainText; -CFStringRef kSecInputIsDigest; -CFStringRef kSecInputIsRaw; - -const CFStringRef kSecDigestTypeAttribute; -const CFStringRef kSecDigestLengthAttribute; -const CFStringRef kSecDigestMD5; -const CFStringRef kSecDigestSHA1; -const CFStringRef kSecDigestSHA2; - -const CFTypeRef kSecAttrKeyType; -const CFTypeRef kSecAttrKeySizeInBits; -const CFTypeRef kSecAttrIsPermanent; -const CFTypeRef kSecAttrKeyTypeRSA; -const CFTypeRef kSecAttrKeyTypeDSA; -const CFTypeRef kSecAttrKeyTypeEC; -const CFTypeRef kSecAttrKeyTypeEC; -const CFTypeRef kSecUseKeychain; """ FUNCTIONS = """ @@ -139,18 +84,6 @@ OSStatus SecItemImport(CFDataRef, CFStringRef, SecExternalFormat *, const SecItemImportExportKeyParameters *, SecKeychainRef, CFArrayRef *); OSStatus SecPKCS12Import(CFDataRef, CFDictionaryRef, CFArrayRef *); - -Boolean SecTransformSetAttribute(SecTransformRef, CFStringRef, CFTypeRef, - CFErrorRef *); -SecTransformRef SecDecryptTransformCreate(SecKeyRef, CFErrorRef *); -SecTransformRef SecEncryptTransformCreate(SecKeyRef, CFErrorRef *); -SecTransformRef SecVerifyTransformCreate(SecKeyRef, CFDataRef, CFErrorRef *); -SecTransformRef SecSignTransformCreate(SecKeyRef, CFErrorRef *) ; -CFTypeRef SecTransformExecute(SecTransformRef, CFErrorRef *); -OSStatus SecKeychainCreate(const char *, UInt32, const void *, Boolean, - SecAccessRef, SecKeychainRef *); -OSStatus SecKeychainDelete(SecKeychainRef); -OSStatus SecKeyGeneratePair(CFDictionaryRef, SecKeyRef *, SecKeyRef *); """ MACROS = """ diff --git a/cryptography/hazma |
