diff options
| author | julien.pierre.boogz%sun.com <devnull@localhost> | 2007-10-12 01:44:51 +0000 |
|---|---|---|
| committer | julien.pierre.boogz%sun.com <devnull@localhost> | 2007-10-12 01:44:51 +0000 |
| commit | 14328f4c4b5667a7434969c92ea4cf3987907e24 (patch) | |
| tree | 39044346411918e83c2ebc3a46cbf4ecef364411 /security/nss/lib/softoken/legacydb/keydb.c | |
| parent | 2aeaf88fba5ccbc345695e57bb4387a7b388308c (diff) | |
| download | nss-hg-14328f4c4b5667a7434969c92ea4cf3987907e24.tar.gz | |
Fix for bug 286642 . Move utility functions to new libnssutil shared library. r=nelson
Diffstat (limited to 'security/nss/lib/softoken/legacydb/keydb.c')
| -rw-r--r-- | security/nss/lib/softoken/legacydb/keydb.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/security/nss/lib/softoken/legacydb/keydb.c b/security/nss/lib/softoken/legacydb/keydb.c index 372bcc583..4756a4632 100644 --- a/security/nss/lib/softoken/legacydb/keydb.c +++ b/security/nss/lib/softoken/legacydb/keydb.c @@ -63,12 +63,14 @@ /* Size of the global salt for key database */ #define SALT_LENGTH 16 +SEC_ASN1_MKSUB(SECOID_AlgorithmIDTemplate); + const SEC_ASN1Template nsslowkey_EncryptedPrivateKeyInfoTemplate[] = { { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWKEYEncryptedPrivateKeyInfo) }, - { SEC_ASN1_INLINE, + { SEC_ASN1_INLINE | SEC_ASN1_XTRN, offsetof(NSSLOWKEYEncryptedPrivateKeyInfo,algorithm), - SECOID_AlgorithmIDTemplate }, + SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) }, { SEC_ASN1_OCTET_STRING, offsetof(NSSLOWKEYEncryptedPrivateKeyInfo,encryptedData) }, { 0 } @@ -1256,9 +1258,9 @@ typedef struct LGEncryptedDataInfoStr LGEncryptedDataInfo; const SEC_ASN1Template lg_EncryptedDataInfoTemplate[] = { { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(LGEncryptedDataInfo) }, - { SEC_ASN1_INLINE, + { SEC_ASN1_INLINE | SEC_ASN1_XTRN, offsetof(LGEncryptedDataInfo,algorithm), - SECOID_AlgorithmIDTemplate }, + SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) }, { SEC_ASN1_OCTET_STRING, offsetof(LGEncryptedDataInfo,encryptedData) }, { 0 } |