diff options
| author | wtc%google.com <devnull@localhost> | 2009-03-25 05:21:32 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2009-03-25 05:21:32 +0000 |
| commit | 2bcec4f099e97207fe6ba6de75636db9344628c4 (patch) | |
| tree | f64bf06aa77234586d40ca7e70b0a461a804b6b1 | |
| parent | 24ae27bbdd6fb9e055dea4bb3e1d3a3f01a9683b (diff) | |
| download | nss-hg-2bcec4f099e97207fe6ba6de75636db9344628c4.tar.gz | |
Bug 402777: moved all fake PKCS #11 defines from secmodt.h to pkcs11n.h.
r=rrelyea. In loader.c, functions returning void must not return a value.
Modified Files:
lib/freebl/loader.c lib/pk11wrap/secmodt.h
lib/softoken/pkcs11n.h
| -rw-r--r-- | security/nss/lib/util/pkcs11n.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/security/nss/lib/util/pkcs11n.h b/security/nss/lib/util/pkcs11n.h index 8ff9c1314..345e5cb94 100644 --- a/security/nss/lib/util/pkcs11n.h +++ b/security/nss/lib/util/pkcs11n.h @@ -90,6 +90,10 @@ static const char CKT_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$"; */ #define CKC_NSS (CKC_VENDOR_DEFINED|NSSCK_VENDOR_NSS) +/* FAKE PKCS #11 defines */ +#define CKA_DIGEST 0x81000000L +#define CKA_FLAGS_ONLY 0 /* CKA_CLASS */ + /* * NSS-defined object attributes * @@ -152,6 +156,7 @@ static const char CKT_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$"; #define CKA_NETSCAPE_TRUST 0x80000001L /* FAKE PKCS #11 defines */ +#define CKM_FAKE_RANDOM 0x80000efeUL #define CKM_INVALID_MECHANISM 0xffffffffUL /* |