summaryrefslogtreecommitdiff
path: root/nss/lib/softoken/lowkeyti.h
diff options
context:
space:
mode:
Diffstat (limited to 'nss/lib/softoken/lowkeyti.h')
-rw-r--r--nss/lib/softoken/lowkeyti.h29
1 files changed, 14 insertions, 15 deletions
diff --git a/nss/lib/softoken/lowkeyti.h b/nss/lib/softoken/lowkeyti.h
index a4c94d8..2ef1640 100644
--- a/nss/lib/softoken/lowkeyti.h
+++ b/nss/lib/softoken/lowkeyti.h
@@ -21,8 +21,7 @@ extern const SEC_ASN1Template nsslowkey_DSAPrivateKeyExportTemplate[];
extern const SEC_ASN1Template nsslowkey_DHPrivateKeyTemplate[];
extern const SEC_ASN1Template nsslowkey_DHPrivateKeyExportTemplate[];
#ifndef NSS_DISABLE_ECC
-#define NSSLOWKEY_EC_PRIVATE_KEY_VERSION 1 /* as per SECG 1 C.4 */
-extern const SEC_ASN1Template nsslowkey_ECParamsTemplate[];
+#define NSSLOWKEY_EC_PRIVATE_KEY_VERSION 1 /* as per SECG 1 C.4 */
extern const SEC_ASN1Template nsslowkey_ECPrivateKeyTemplate[];
#endif /* NSS_DISABLE_ECC */
@@ -49,12 +48,12 @@ struct NSSLOWKEYPrivateKeyInfoStr {
NSSLOWKEYAttribute **attributes;
};
typedef struct NSSLOWKEYPrivateKeyInfoStr NSSLOWKEYPrivateKeyInfo;
-#define NSSLOWKEY_PRIVATE_KEY_INFO_VERSION 0 /* what we *create* */
+#define NSSLOWKEY_PRIVATE_KEY_INFO_VERSION 0 /* what we *create* */
-typedef enum {
- NSSLOWKEYNullKey = 0,
- NSSLOWKEYRSAKey = 1,
- NSSLOWKEYDSAKey = 2,
+typedef enum {
+ NSSLOWKEYNullKey = 0,
+ NSSLOWKEYRSAKey = 1,
+ NSSLOWKEYDSAKey = 2,
NSSLOWKEYDHKey = 4,
NSSLOWKEYECKey = 5
} NSSLOWKEYType;
@@ -64,12 +63,12 @@ typedef enum {
*/
struct NSSLOWKEYPublicKeyStr {
PLArenaPool *arena;
- NSSLOWKEYType keyType ;
+ NSSLOWKEYType keyType;
union {
RSAPublicKey rsa;
- DSAPublicKey dsa;
- DHPublicKey dh;
- ECPublicKey ec;
+ DSAPublicKey dsa;
+ DHPublicKey dh;
+ ECPublicKey ec;
} u;
};
typedef struct NSSLOWKEYPublicKeyStr NSSLOWKEYPublicKey;
@@ -84,11 +83,11 @@ struct NSSLOWKEYPrivateKeyStr {
NSSLOWKEYType keyType;
union {
RSAPrivateKey rsa;
- DSAPrivateKey dsa;
- DHPrivateKey dh;
- ECPrivateKey ec;
+ DSAPrivateKey dsa;
+ DHPrivateKey dh;
+ ECPrivateKey ec;
} u;
};
typedef struct NSSLOWKEYPrivateKeyStr NSSLOWKEYPrivateKey;
-#endif /* _LOWKEYTI_H_ */
+#endif /* _LOWKEYTI_H_ */