Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / SecKey.cpp

diff --git a/OSX/libsecurity_keychain/lib/SecKey.cpp b/OSX/libsecurity_keychain/lib/SecKey.cpp
index 7ef6027bf481f69692e8523c84ffde40384840ba..940caae2b85a5b5477e2b3edb50bf79a18ee52cc 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecKey.cpp
+++ b/OSX/libsecurity_keychain/lib/SecKey.cpp
@@ -804,20 +804,19 @@ static Boolean SecCDSAKeySetParameter(SecKeyRef key, CFStringRef name, CFPropert
 const SecKeyDescriptor kSecCDSAKeyDescriptor = {
     .version = kSecKeyDescriptorVersion,
     .name = "CDSAKey",
 const SecKeyDescriptor kSecCDSAKeyDescriptor = {
     .version = kSecKeyDescriptorVersion,
     .name = "CDSAKey",

+    .extraBytes = (sizeof(class CDSASecKey) > sizeof(struct __SecKey) ? (sizeof(class CDSASecKey) - sizeof(struct __SecKey)) : 0),

 
     .init = SecCDSAKeyInit,
     .destroy = SecCDSAKeyDestroy,
     .blockSize = SecCDSAKeyGetBlockSize,
 
     .init = SecCDSAKeyInit,
     .destroy = SecCDSAKeyDestroy,
     .blockSize = SecCDSAKeyGetBlockSize,

-    .getAlgorithmID = SecCDSAKeyGetAlgorithmId,

     .copyDictionary = SecCDSAKeyCopyAttributeDictionary,
     .copyDictionary = SecCDSAKeyCopyAttributeDictionary,

+    .getAlgorithmID = SecCDSAKeyGetAlgorithmId,

     .copyPublic = SecCDSAKeyCopyPublicBytes,
     .copyExternalRepresentation = SecCDSAKeyCopyExternalRepresentation,
     .copyPublicKey = SecCDSAKeyCopyPublicKey,
     .copyOperationResult = SecCDSAKeyCopyOperationResult,
     .isEqual = SecCDSAKeyIsEqual,
     .setParameter = SecCDSAKeySetParameter,
     .copyPublic = SecCDSAKeyCopyPublicBytes,
     .copyExternalRepresentation = SecCDSAKeyCopyExternalRepresentation,
     .copyPublicKey = SecCDSAKeyCopyPublicKey,
     .copyOperationResult = SecCDSAKeyCopyOperationResult,
     .isEqual = SecCDSAKeyIsEqual,
     .setParameter = SecCDSAKeySetParameter,

-
-    .extraBytes = (sizeof(class CDSASecKey) > sizeof(struct __SecKey) ? (sizeof(class CDSASecKey) - sizeof(struct __SecKey)) : 0),

 };
 
 namespace Security {
 };
 
 namespace Security {