From 286f231eb9237bd800aa339aff2413f147300552 Mon Sep 17 00:00:00 2001 From: Tomas Kukosa Date: Wed, 17 Oct 2007 10:25:21 +0000 Subject: new H.323 dissector - Generic Extensible Framework helper - Annex M1 (QSIG over H.323) - Annex M4 - Annex R H.225/H.245 support for Generic Extensible Framework (GEF) H.235 register MIKEY into new H.225/H.245 GEF tables regenerate H.225,H.245,H.235,H.450,H.450-ROS,T.35 from new makefiles svn path=/trunk/; revision=23216 --- asn1/h235/Makefile.common | 8 +++++--- asn1/h235/h235.cnf | 5 ++++- asn1/h235/packet-h235-template.c | 40 ++++++++++++++++++++++++---------------- 3 files changed, 33 insertions(+), 20 deletions(-) (limited to 'asn1/h235') diff --git a/asn1/h235/Makefile.common b/asn1/h235/Makefile.common index fe9adec5fc..2ef4bba16f 100644 --- a/asn1/h235/Makefile.common +++ b/asn1/h235/Makefile.common @@ -20,9 +20,10 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -PROTOCOL_NAME=h235 +PROTOCOL_NAME = h235 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ +DISSECTOR_FILES = \ + packet-$(PROTOCOL_NAME).c \ packet-$(PROTOCOL_NAME).h NEED_PACKET_PROTO_H = 1 @@ -53,5 +54,6 @@ EXTRA_CNF = \ ../h225/h225-exp.cnf ../h225/h225-exp.cnf: - (cd ../h235 && $(MAKE_CNF_EXPORT)) + (cd ../h225 && $(MAKE_CNF_EXPORT)) + diff --git a/asn1/h235/h235.cnf b/asn1/h235/h235.cnf index 5681c06d57..98644aa03f 100644 --- a/asn1/h235/h235.cnf +++ b/asn1/h235/h235.cnf @@ -16,10 +16,13 @@ ClearToken CryptoToken AuthenticationMechanism -SrtpCryptoCapability SrtpKeys #.END +#.PDU_NEW +SrtpCryptoCapability +#.END + #.OMIT_ASSIGNMENT ECGDSASignature H235CertificateSignature diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c index 82f75869c2..235017b624 100644 --- a/asn1/h235/packet-h235-template.c +++ b/asn1/h235/packet-h235-template.c @@ -111,6 +111,10 @@ void proto_register_h235(void) { add_oid_str_name(OID_TG, "itu-t(0) recommendation(0) h(8) 235 version(0) 3 70 - TG"); /* H.235.7, Chapter 9.5 */ add_oid_str_name(OID_SG, "itu-t(0) recommendation(0) h(8) 235 version(0) 3 71 - SG"); + /* H.235.8, Chapter 4.2, Table 2 */ + add_oid_str_name("0.0.8.235.0.4.91", "itu-t(0) recommendation(0) h(8) 235 version(0) 4 91 - AES_CM_128_HMAC_SHA1_80"); + add_oid_str_name("0.0.8.235.0.4.92", "itu-t(0) recommendation(0) h(8) 235 version(0) 4 92 - AES_CM_128_HMAC_SHA1_32"); + add_oid_str_name("0.0.8.235.0.4.93", "itu-t(0) recommendation(0) h(8) 235 version(0) 4 93 - F8_128_HMAC_SHA1_80"); } @@ -120,23 +124,27 @@ void proto_reg_handoff_h235(void) { mikey_handle = find_dissector("mikey"); /* H.235.7, Chapter 7.1, MIKEY operation at "session level" */ - dissector_add_string("h245.gen_par", OID_MIKEY "-0", mikey_handle); - dissector_add_string("h245.gen_par", OID_MIKEY_PS "-0", mikey_handle); - dissector_add_string("h245.gen_par", OID_MIKEY_DHHMAC "-0", mikey_handle); - dissector_add_string("h245.gen_par", OID_MIKEY_PK_SIGN "-0", mikey_handle); - dissector_add_string("h245.gen_par", OID_MIKEY_DH_SIGN "-0", mikey_handle); - dissector_add_string("h245.gen_par", "EncryptionSync-0", mikey_handle); + dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY "/nonCollapsing/0", mikey_handle); + dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY_PS "/nonCollapsing/0", mikey_handle); + dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY_DHHMAC "/nonCollapsing/0", mikey_handle); + dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY_PK_SIGN "/nonCollapsing/0", mikey_handle); + dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY_DH_SIGN "/nonCollapsing/0", mikey_handle); + dissector_add_string("h245.gef.content", "EncryptionSync/0", mikey_handle); /* H.235.7, Chapter 7.2, MIKEY operation at "media level" */ - dissector_add_string("h245.gen_par", "EncryptionSync-76", mikey_handle); - dissector_add_string("h245.gen_par", "EncryptionSync-72", mikey_handle); - dissector_add_string("h245.gen_par", "EncryptionSync-73", mikey_handle); - dissector_add_string("h245.gen_par", "EncryptionSync-74", mikey_handle); - dissector_add_string("h245.gen_par", "EncryptionSync-75", mikey_handle); - dissector_add_string("h245.gen_par", OID_MIKEY "-76", mikey_handle); - dissector_add_string("h245.gen_par", OID_MIKEY_PS "-72", mikey_handle); - dissector_add_string("h245.gen_par", OID_MIKEY_DHHMAC "-73", mikey_handle); - dissector_add_string("h245.gen_par", OID_MIKEY_PK_SIGN "-74", mikey_handle); - dissector_add_string("h245.gen_par", OID_MIKEY_DH_SIGN "-75", mikey_handle); + dissector_add_string("h245.gef.content", "EncryptionSync/76", mikey_handle); + dissector_add_string("h245.gef.content", "EncryptionSync/72", mikey_handle); + dissector_add_string("h245.gef.content", "EncryptionSync/73", mikey_handle); + dissector_add_string("h245.gef.content", "EncryptionSync/74", mikey_handle); + dissector_add_string("h245.gef.content", "EncryptionSync/75", mikey_handle); + dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY "/nonCollapsing/76", mikey_handle); + dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY_PS "/nonCollapsing/72", mikey_handle); + dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY_DHHMAC "/nonCollapsing/73", mikey_handle); + dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY_PK_SIGN "/nonCollapsing/74", mikey_handle); + dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY_DH_SIGN "/nonCollapsing/75", mikey_handle); + + /* H.235.8, Chapter 4.1.2, SrtpCryptoCapability transport */ + dissector_add_string("h245.gef.content", "GenericCapability/0.0.8.235.0.4.90/nonCollapsingRaw", + new_create_dissector_handle(dissect_SrtpCryptoCapability_PDU, proto_h235)); } -- cgit v1.2.3