VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fixed asn1

Browse Source
This commit is contained in:
Frank Morgner
2013-02-09 23:43:52 +01:00
parent 5c900a71dc
commit 7a85d916be
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
npa/src/npa.c
View File

@@ -65,6 +65,17 @@ typedef struct npa_mse_cd_st {
ASN1_AUXILIARY_DATA *auxiliary_data; ASN1_AUXILIARY_DATA *auxiliary_data;
CVC_CHAT *chat; CVC_CHAT *chat;
} NPA_MSE_C; } NPA_MSE_C;
/* Note that we can not use ASN1_AUXILIARY_DATA for the auxiliary_data element
* here. Due to limitations of OpenSSL it is not possible to *encode* an
* optional item template (such as auxiliary_data) in an other item template
* (such as ASN1_AUXILIARY_DATA). However, we can do
*
* NPA_MSE_C->auxiliary_data = d2i_ASN1_AUXILIARY_DATA(...)
*
* because they both use the same underlieing struct.
*
* See also openssl/crypto/asn1/tasn_dec.c:183
*/
ASN1_SEQUENCE(NPA_MSE_C) = { ASN1_SEQUENCE(NPA_MSE_C) = {
/* 0x80 /* 0x80
* Cryptographic mechanism reference */ * Cryptographic mechanism reference */
@@ -79,8 +90,8 @@ ASN1_SEQUENCE(NPA_MSE_C) = {
* Ephemeral Public Key */ * Ephemeral Public Key */
ASN1_IMP_OPT(NPA_MSE_C, eph_pub_key, ASN1_OCTET_STRING, 0x11), ASN1_IMP_OPT(NPA_MSE_C, eph_pub_key, ASN1_OCTET_STRING, 0x11),
/* 0x67 /* 0x67
* Auxiliary authenticated data */ * Auxiliary authenticated data. See note above. */
ASN1_OPT(NPA_MSE_C, auxiliary_data, ASN1_AUXILIARY_DATA), ASN1_APP_IMP_OPT(NPA_MSE_C, auxiliary_data, CVC_DISCRETIONARY_DATA_TEMPLATES, 7),
/* Certificate Holder Authorization Template */ /* Certificate Holder Authorization Template */
ASN1_OPT(NPA_MSE_C, chat, CVC_CHAT), ASN1_OPT(NPA_MSE_C, chat, CVC_CHAT),
} ASN1_SEQUENCE_END(NPA_MSE_C) } ASN1_SEQUENCE_END(NPA_MSE_C)