diff --git a/src/libopensc/pkcs15.h b/src/libopensc/pkcs15.h index dd46d242..7d922c39 100644 --- a/src/libopensc/pkcs15.h +++ b/src/libopensc/pkcs15.h @@ -162,6 +162,15 @@ struct sc_pkcs15_u8 { }; typedef struct sc_pkcs15_u8 sc_pkcs15_u8_t; +struct sc_pkcs15_data { + u8 *data; /* DER encoded raw data object */ + size_t data_len; +}; +typedef struct sc_pkcs15_data sc_pkcs15_data_t; + +#define sc_pkcs15_skey sc_pkcs15_data +#define sc_pkcs15_skey_t sc_pkcs15_data_t + struct sc_pkcs15_pubkey_rsa { sc_pkcs15_bignum_t modulus; sc_pkcs15_bignum_t exponent; @@ -251,6 +260,7 @@ struct sc_pkcs15_prkey { struct sc_pkcs15_prkey_dsa dsa; struct sc_pkcs15_prkey_ec ec; struct sc_pkcs15_prkey_gostr3410 gostr3410; + struct sc_pkcs15_skey secret; } u; }; typedef struct sc_pkcs15_prkey sc_pkcs15_prkey_t; @@ -296,12 +306,6 @@ struct sc_pkcs15_cert_info { }; typedef struct sc_pkcs15_cert_info sc_pkcs15_cert_info_t; -struct sc_pkcs15_data { - u8 *data; /* DER encoded raw data object */ - size_t data_len; -}; -typedef struct sc_pkcs15_data sc_pkcs15_data_t; - struct sc_pkcs15_data_info { /* FIXME: there is no pkcs15 ID in DataType */ struct sc_pkcs15_id id; @@ -429,9 +433,6 @@ struct sc_pkcs15_skey_info { }; typedef struct sc_pkcs15_skey_info sc_pkcs15_skey_info_t; -#define sc_pkcs15_skey sc_pkcs15_data -#define sc_pkcs15_skey_t sc_pkcs15_data_t - #define SC_PKCS15_TYPE_CLASS_MASK 0xF00 #define SC_PKCS15_TYPE_PRKEY 0x100