diff options
| author | relyea%netscape.com <devnull@localhost> | 2001-09-20 21:37:16 +0000 |
|---|---|---|
| committer | relyea%netscape.com <devnull@localhost> | 2001-09-20 21:37:16 +0000 |
| commit | fbef7a20a10e9094c91ac7a307948d042fe89434 (patch) | |
| tree | b157298725360ea25ca6b01607c53a93d6de17e9 /security/nss/lib/pkcs7/pkcs7t.h | |
| parent | 0959c51d478fee7614202295f8cc27daa70b4e98 (diff) | |
| download | nss-hg-fbef7a20a10e9094c91ac7a307948d042fe89434.tar.gz | |
Fix compilier warnings on AIX, Solaris, HP, and Linux.
Diffstat (limited to 'security/nss/lib/pkcs7/pkcs7t.h')
| -rw-r--r-- | security/nss/lib/pkcs7/pkcs7t.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/security/nss/lib/pkcs7/pkcs7t.h b/security/nss/lib/pkcs7/pkcs7t.h index a3e974f7b..251d917b7 100644 --- a/security/nss/lib/pkcs7/pkcs7t.h +++ b/security/nss/lib/pkcs7/pkcs7t.h @@ -51,6 +51,10 @@ typedef struct SEC_PKCS7DecoderContextStr SEC_PKCS7DecoderContext; typedef struct SEC_PKCS7EncoderContextStr SEC_PKCS7EncoderContext; +/* legacy defines that haven't been active for years */ +typedef void *(*SECKEYGetPasswordKey)(void *arg, void *handle); + + /* Non-opaque objects. NOTE, though: I want them to be treated as * opaque as much as possible. If I could hide them completely, * I would. (I tried, but ran into trouble that was taking me too @@ -100,7 +104,6 @@ typedef struct SEC_PKCS7SMIMEKEAParametersStr SEC_PKCS7SMIMEKEAParameters; */ typedef struct SEC_PKCS7AttributeStr SEC_PKCS7Attribute; - struct SEC_PKCS7ContentInfoStr { PRArenaPool *poolp; /* local; not part of encoding */ PRBool created; /* local; not part of encoding */ @@ -223,7 +226,8 @@ typedef enum { SECKEAUsesSkipjack = 0, SECKEAUsesNonSkipjack = 1, - SECKEAUsesNonSkipjackWithPaddedEncKey = 2 + SECKEAUsesNonSkipjackWithPaddedEncKey = 2, + SECKEAInvalid = -1 } SECKEATemplateSelector; /* ### mwelch - S/MIME KEA parameters. These don't really fit here, |