diff options
-rw-r--r-- | epan/dissectors/asn1/ftam/packet-ftam-template.c | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/gsm_map/gsm_map.cnf | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/pkcs1/packet-pkcs1-template.c | 42 | ||||
-rw-r--r-- | epan/dissectors/asn1/snmp/packet-snmp-template.c | 4 | ||||
-rw-r--r-- | epan/dissectors/asn1/z3950/packet-z3950-template.c | 6 |
6 files changed, 50 insertions, 8 deletions
diff --git a/epan/dissectors/asn1/ftam/packet-ftam-template.c b/epan/dissectors/asn1/ftam/packet-ftam-template.c index 37d59ea4cf..d4f8399c8d 100644 --- a/epan/dissectors/asn1/ftam/packet-ftam-template.c +++ b/epan/dissectors/asn1/ftam/packet-ftam-template.c @@ -56,7 +56,7 @@ static expert_field ei_ftam_zero_pdu = EI_INIT; static int dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree, void* data _U_) { - proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_reported_length_remaining(tvb, 0), ENC_ASCII|ENC_NA); + proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_reported_length_remaining(tvb, 0), ENC_ASCII); return tvb_captured_length(tvb); } diff --git a/epan/dissectors/asn1/gsm_map/gsm_map.cnf b/epan/dissectors/asn1/gsm_map/gsm_map.cnf index 4b98629094..297ecacaa2 100644 --- a/epan/dissectors/asn1/gsm_map/gsm_map.cnf +++ b/epan/dissectors/asn1/gsm_map/gsm_map.cnf @@ -690,7 +690,7 @@ MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS" break; case SMS_ENCODING_8BIT: /* XXX - ASCII, or some extended ASCII? */ - proto_tree_add_item(subtree, hf_gsm_map_ussd_string, parameter_tvb, 0, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_gsm_map_ussd_string, parameter_tvb, 0, length, ENC_ASCII); break; case SMS_ENCODING_UCS2: case SMS_ENCODING_UCS2_LANG: diff --git a/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c b/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c index cde4f9b17e..f3ecee1d8c 100644 --- a/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c +++ b/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c @@ -202,7 +202,7 @@ dissect_lnpdqp_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr if(no_of_digits == 0) return; offset++; - proto_tree_add_item(subtree, hf_lnpdqp_ia5_digits, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_lnpdqp_ia5_digits, tvb, offset, -1, ENC_ASCII); proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(pinfo->pool,tvb,offset,tvb_reported_length_remaining(tvb,offset), ENC_ASCII | ENC_NA)); break; default: diff --git a/epan/dissectors/asn1/pkcs1/packet-pkcs1-template.c b/epan/dissectors/asn1/pkcs1/packet-pkcs1-template.c index 21712bd85b..aebffc5c9e 100644 --- a/epan/dissectors/asn1/pkcs1/packet-pkcs1-template.c +++ b/epan/dissectors/asn1/pkcs1/packet-pkcs1-template.c @@ -119,5 +119,47 @@ void proto_reg_handoff_pkcs1(void) { oid_add_from_string("sha512", "2.16.840.1.101.3.4.2.3"); oid_add_from_string("sha224", "2.16.840.1.101.3.4.2.4"); + /* PQC digital signature algorithms from OQS-OpenSSL, + see https://github.com/open-quantum-safe/openssl/blob/OQS-OpenSSL_1_1_1-stable/oqs-template/oqs-sig-info.md */ + oid_add_from_string("dilithium2", "1.3.6.1.4.1.2.267.7.4.4"); + oid_add_from_string("p256_dilithium2", "1.3.9999.2.7.1"); + oid_add_from_string("rsa3072_dilithium2", "1.3.9999.2.7.2"); + oid_add_from_string("dilithium3", "1.3.6.1.4.1.2.267.7.6.5"); + oid_add_from_string("p384_dilithium3", "1.3.9999.2.7.3"); + oid_add_from_string("dilithium5", "1.3.6.1.4.1.2.267.7.8.7"); + oid_add_from_string("p521_dilithium5", "1.3.9999.2.7.4"); + oid_add_from_string("dilithium2_aes", "1.3.6.1.4.1.2.267.11.4.4"); + oid_add_from_string("p256_dilithium2_aes", "1.3.9999.2.11.1"); + oid_add_from_string("rsa3072_dilithium2_aes", "1.3.9999.2.11.2"); + oid_add_from_string("dilithium3_aes", "1.3.6.1.4.1.2.267.11.6.5"); + oid_add_from_string("p384_dilithium3_aes", "1.3.9999.2.11.3"); + oid_add_from_string("dilithium5_aes", "1.3.6.1.4.1.2.267.11.8.7"); + oid_add_from_string("p521_dilithium5_aes", "1.3.9999.2.11.4"); + oid_add_from_string("falcon512", "1.3.9999.3.1"); + oid_add_from_string("p256_falcon512", "1.3.9999.3.2"); + oid_add_from_string("rsa3072_falcon512", "1.3.9999.3.3"); + oid_add_from_string("falcon1024", "1.3.9999.3.4"); + oid_add_from_string("p521_falcon1024", "1.3.9999.3.5"); + oid_add_from_string("picnicl1full", "1.3.6.1.4.1.311.89.2.1.7"); + oid_add_from_string("p256_picnicl1full", "1.3.6.1.4.1.311.89.2.1.8"); + oid_add_from_string("rsa3072_picnicl1full", "1.3.6.1.4.1.311.89.2.1.9"); + oid_add_from_string("picnic3l1", "1.3.6.1.4.1.311.89.2.1.21"); + oid_add_from_string("p256_picnic3l1", "1.3.6.1.4.1.311.89.2.1.22"); + oid_add_from_string("rsa3072_picnic3l1", "1.3.6.1.4.1.311.89.2.1.23"); + oid_add_from_string("rainbowIclassic", "1.3.9999.5.1.1.1"); + oid_add_from_string("p256_rainbowIclassic", "1.3.9999.5.1.2.1"); + oid_add_from_string("rsa3072_rainbowIclassic", "1.3.9999.5.1.3.1"); + oid_add_from_string("rainbowVclassic", "1.3.9999.5.3.1.1"); + oid_add_from_string("p521_rainbowVclassic", "1.3.9999.5.3.2.1"); + oid_add_from_string("sphincsharaka128frobust", "1.3.9999.6.1.1"); + oid_add_from_string("p256_sphincsharaka128frobust", "1.3.9999.6.1.2"); + oid_add_from_string("rsa3072_sphincsharaka128frobust", "1.3.9999.6.1.3"); + oid_add_from_string("sphincssha256128frobust", "1.3.9999.6.4.1"); + oid_add_from_string("p256_sphincssha256128frobust", "1.3.9999.6.4.2"); + oid_add_from_string("rsa3072_sphincssha256128frobust", "1.3.9999.6.4.3"); + oid_add_from_string("sphincsshake256128frobust", "1.3.9999.6.7.1"); + oid_add_from_string("p256_sphincsshake256128frobust", "1.3.9999.6.7.2"); + oid_add_from_string("rsa3072_sphincsshake256128frobust", "1.3.9999.6.7.3"); + } diff --git a/epan/dissectors/asn1/snmp/packet-snmp-template.c b/epan/dissectors/asn1/snmp/packet-snmp-template.c index dd47331c85..200f7eedbf 100644 --- a/epan/dissectors/asn1/snmp/packet-snmp-template.c +++ b/epan/dissectors/asn1/snmp/packet-snmp-template.c @@ -476,7 +476,7 @@ static int dissect_snmp_variable_string(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_tree_add_item(tree, hf_snmp_var_bind_str, tvb, 0, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_snmp_var_bind_str, tvb, 0, -1, ENC_ASCII); return tvb_captured_length(tvb); } @@ -1316,7 +1316,7 @@ dissect_snmp_engineid(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, int o case SNMP_ENGINEID_FORMAT_TEXT: /* max. 27-byte string, administratively assigned */ if (len_remain<=27) { - proto_tree_add_item(tree, hf_snmp_engineid_text, tvb, offset, len_remain, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_snmp_engineid_text, tvb, offset, len_remain, ENC_ASCII); offset+=len_remain; len_remain=0; } diff --git a/epan/dissectors/asn1/z3950/packet-z3950-template.c b/epan/dissectors/asn1/z3950/packet-z3950-template.c index 9359deb714..fa5d9d1f64 100644 --- a/epan/dissectors/asn1/z3950/packet-z3950-template.c +++ b/epan/dissectors/asn1/z3950/packet-z3950-template.c @@ -1566,7 +1566,7 @@ dissect_marc_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * if (marc_directory[dir_index].tag < 10) { proto_tree_add_item(field_tree, hf_marc_field_control, - tvb, offset, marc_directory[dir_index].length - 1, ENC_ASCII|ENC_NA); + tvb, offset, marc_directory[dir_index].length - 1, ENC_ASCII); offset += marc_directory[dir_index].length - 1; proto_tree_add_item(field_tree, hf_marc_field_terminator, tvb, offset, 1, ENC_ASCII); @@ -1592,12 +1592,12 @@ dissect_marc_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * MARC_SUBFIELD_INDICATOR); if (next_subfield >= 0) { proto_tree_add_item(field_tree, hf_marc_field_subfield, - tvb, offset, next_subfield - offset, ENC_ASCII|ENC_NA); + tvb, offset, next_subfield - offset, ENC_ASCII); offset += (next_subfield - offset); } else { proto_tree_add_item(field_tree, hf_marc_field_subfield, - tvb, offset, next_offset - offset, ENC_ASCII|ENC_NA); + tvb, offset, next_offset - offset, ENC_ASCII); offset = next_offset; } } while (offset < next_offset); |