diff options
-rw-r--r-- | asn1/pkcs1/PKCS1.asn | 57 | ||||
-rw-r--r-- | asn1/pkcs1/packet-pkcs1-template.c | 93 | ||||
-rw-r--r-- | asn1/pkcs1/packet-pkcs1-template.h | 31 | ||||
-rw-r--r-- | asn1/pkcs1/pkcs1.cnf | 25 | ||||
-rw-r--r-- | epan/dissectors/Makefile.common | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-pkcs1.c | 332 | ||||
-rw-r--r-- | epan/dissectors/packet-pkcs1.h | 52 |
7 files changed, 592 insertions, 0 deletions
diff --git a/asn1/pkcs1/PKCS1.asn b/asn1/pkcs1/PKCS1.asn new file mode 100644 index 0000000000..44a5d440ba --- /dev/null +++ b/asn1/pkcs1/PKCS1.asn @@ -0,0 +1,57 @@ +-- Module PKCS-1 +-- Transcribed from RFC2313 + +PKCS-1 {iso(1) member-body(2) US(840) rsadsi(113549) pkcs(1) 1 } DEFINITIONS ::= +BEGIN + +IMPORTS + AlgorithmIdentifier + FROM AuthenticationFramework {joint-iso-itu-t ds(5) module(1) + authenticationFramework(7) 4}; + +-- EXPORTS All +-- The types and values defined in this module have been transcribed from RFC2313 + +RSAPublicKey ::= SEQUENCE { + modulus INTEGER, -- n + publicExponent INTEGER -- e +} + +RSAPrivateKey ::= SEQUENCE { + version Version, + modulus INTEGER, -- n + publicExponent INTEGER, -- e + privateExponent INTEGER, -- d + prime1 INTEGER, -- p + prime2 INTEGER, -- q + exponent1 INTEGER, -- d mod (p-1) + exponent2 INTEGER, -- d mod (q-1) + coefficient INTEGER -- (inverse of q) mod p +} + +Version ::= INTEGER + +DigestInfo ::= SEQUENCE { + digestAlgorithm DigestAlgorithmIdentifier, + digest Digest +} + +DigestAlgorithmIdentifier ::= AlgorithmIdentifier + +Digest ::= OCTET STRING + + +-- These algorithms have NULL parameters +-- md2 OBJECT IDENTIFIER ::= { iso(1) member-body(2) US(840) rsadsi(113549) digestAlgorithm(2) 2 } +-- md4 OBJECT IDENTIFIER ::= { iso(1) member-body(2) US(840) rsadsi(113549) digestAlgorithm(2) 4 } +-- md5 OBJECT IDENTIFIER ::= { iso(1) member-body(2) US(840) rsadsi(113549) digestAlgorithm(2) 5 } + + +-- pkcs-1 OBJECT IDENTIFIER ::= { iso(1) member-body(2) US(840) rsadsi(113549) pkcs(1) 1 } +-- rsaEncryption OBJECT IDENTIFIER ::= { pkcs-1 1 } +-- md2WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 2 } +-- md4WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 3 } +-- md5WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 4 } + +END + diff --git a/asn1/pkcs1/packet-pkcs1-template.c b/asn1/pkcs1/packet-pkcs1-template.c new file mode 100644 index 0000000000..ee97f5d988 --- /dev/null +++ b/asn1/pkcs1/packet-pkcs1-template.c @@ -0,0 +1,93 @@ +/* packet-pkcs1.c + * Routines for PKCS#1/RFC2313 packet dissection + * + * $Id: packet-pkcs1-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <glib.h> +#include <epan/packet.h> +#include <epan/conversation.h> + +#include <stdio.h> +#include <string.h> + +#include "packet-ber.h" +#include "packet-x509af.h" + +#define PNAME "PKCS#1" +#define PSNAME "PKCS-1" +#define PFNAME "pkcs-1" + +/* Initialize the protocol and registered fields */ +static int proto_pkcs1 = -1; +#include "packet-pkcs1-hf.c" + +/* Initialize the subtree pointers */ +#include "packet-pkcs1-ett.c" + +#include "packet-pkcs1-fn.c" + +/*--- proto_register_pkcs1 ----------------------------------------------*/ +void proto_register_pkcs1(void) { + + /* List of fields */ + static hf_register_info hf[] = { +#include "packet-pkcs1-hfarr.c" + }; + + /* List of subtrees */ + static gint *ett[] = { +#include "packet-pkcs1-ettarr.c" + }; + + /* Register protocol */ + proto_pkcs1 = proto_register_protocol(PNAME, PSNAME, PFNAME); + + /* Register fields and subtrees */ + proto_register_field_array(proto_pkcs1, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + +} + + +/*--- proto_reg_handoff_pkcs1 -------------------------------------------*/ +void proto_reg_handoff_pkcs1(void) { + register_ber_oid_dissector("1.2.840.113549.2.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2"); + register_ber_oid_dissector("1.2.840.113549.2.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4"); + register_ber_oid_dissector("1.2.840.113549.2.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "md5"); + + register_ber_oid_dissector("1.2.840.113549.1.1.1", dissect_ber_oid_NULL_callback, proto_pkcs1, "rsaEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.3", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md5WithRSAEncryption"); + + + /* these two are not from RFC2313 but pulled in from + http://www.alvestrand.no/objectid/1.2.840.113549.1.1.html + */ + register_ber_oid_dissector("1.2.840.113549.1.1.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "shaWithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.6", dissect_ber_oid_NULL_callback, proto_pkcs1, "rsaOAEPEncryptionSET"); +} + diff --git a/asn1/pkcs1/packet-pkcs1-template.h b/asn1/pkcs1/packet-pkcs1-template.h new file mode 100644 index 0000000000..50201f11d4 --- /dev/null +++ b/asn1/pkcs1/packet-pkcs1-template.h @@ -0,0 +1,31 @@ +/* packet-pkcs1.h + * Routines for PKCS#1/RFC2313 packet dissection + * + * $Id: packet-pkcs1-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef PACKET_PKCS1_H +#define PACKET_PKCS1_H + +#include "packet-pkcs1-exp.h" + +#endif /* PACKET_PKCS1_H */ + diff --git a/asn1/pkcs1/pkcs1.cnf b/asn1/pkcs1/pkcs1.cnf new file mode 100644 index 0000000000..76b5acd95f --- /dev/null +++ b/asn1/pkcs1/pkcs1.cnf @@ -0,0 +1,25 @@ +# pkcs1.cnf
+# PKCS#1 conformation file
+
+# $Id: pkcs1.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $
+
+#.MODULE_IMPORT
+AuthenticationFramework x509af
+
+#.INCLUDE ../x509af/x509af_exp.cnf
+
+#.EXPORTS
+
+RSAPrivateKey
+RSAPublicKey
+DigestInfo
+
+#.NO_EMIT
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
+
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 9a9c156a1a..642351fb6c 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -366,6 +366,7 @@ DISSECTOR_SRC = \ packet-pflog.c \ packet-pgm.c \ packet-pim.c \ + packet-pkcs1.c \ packet-pktc.c \ packet-pop.c \ packet-portmap.c \ @@ -639,6 +640,7 @@ DISSECTOR_INCLUDES = \ packet-per.h \ packet-pflog.h \ packet-pim.h \ + packet-pkcs1.h \ packet-pktc.h \ packet-portmap.h \ packet-ppp.h \ diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c new file mode 100644 index 0000000000..58a9d62e5a --- /dev/null +++ b/epan/dissectors/packet-pkcs1.c @@ -0,0 +1,332 @@ +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* packet-pkcs1.c */ +/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ + +/* Input file: packet-pkcs1-template.c */ +/* Include files: packet-pkcs1-hf.c, packet-pkcs1-ett.c, packet-pkcs1-fn.c, packet-pkcs1-hfarr.c, packet-pkcs1-ettarr.c, packet-pkcs1-val.h */ + +/* packet-pkcs1.c + * Routines for PKCS#1/RFC2313 packet dissection + * + * $Id: packet-pkcs1-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <glib.h> +#include <epan/packet.h> +#include <epan/conversation.h> + +#include <stdio.h> +#include <string.h> + +#include "packet-ber.h" +#include "packet-x509af.h" + +#define PNAME "PKCS#1" +#define PSNAME "PKCS-1" +#define PFNAME "pkcs-1" + +/* Initialize the protocol and registered fields */ +static int proto_pkcs1 = -1; + +/*--- Included file: packet-pkcs1-hf.c ---*/ + +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* packet-pkcs1-hf.c */ +/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ + +static int hf_pkcs1_modulus = -1; /* INTEGER */ +static int hf_pkcs1_publicExponent = -1; /* INTEGER */ +static int hf_pkcs1_version = -1; /* Version */ +static int hf_pkcs1_privateExponent = -1; /* INTEGER */ +static int hf_pkcs1_prime1 = -1; /* INTEGER */ +static int hf_pkcs1_prime2 = -1; /* INTEGER */ +static int hf_pkcs1_exponent1 = -1; /* INTEGER */ +static int hf_pkcs1_exponent2 = -1; /* INTEGER */ +static int hf_pkcs1_coefficient = -1; /* INTEGER */ +static int hf_pkcs1_digestAlgorithm = -1; /* DigestAlgorithmIdentifier */ +static int hf_pkcs1_digest = -1; /* Digest */ + +/*--- End of included file: packet-pkcs1-hf.c ---*/ + + +/* Initialize the subtree pointers */ + +/*--- Included file: packet-pkcs1-ett.c ---*/ + +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* packet-pkcs1-ett.c */ +/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ + +static gint ett_pkcs1_RSAPublicKey = -1; +static gint ett_pkcs1_RSAPrivateKey = -1; +static gint ett_pkcs1_DigestInfo = -1; + +/*--- End of included file: packet-pkcs1-ett.c ---*/ + + + +/*--- Included file: packet-pkcs1-fn.c ---*/ + +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* packet-pkcs1-fn.c */ +/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ + +/*--- Fields for imported types ---*/ + + + + +static int +dissect_pkcs1_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_integer(pinfo, tree, tvb, offset, hf_index, NULL); + + return offset; +} +static int dissect_modulus(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_modulus); +} +static int dissect_publicExponent(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_publicExponent); +} +static int dissect_privateExponent(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_privateExponent); +} +static int dissect_prime1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_prime1); +} +static int dissect_prime2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_prime2); +} +static int dissect_exponent1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_exponent1); +} +static int dissect_exponent2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_exponent2); +} +static int dissect_coefficient(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_coefficient); +} + +static ber_sequence RSAPublicKey_sequence[] = { + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus }, + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent }, + { 0, 0, 0, NULL } +}; + +int +dissect_pkcs1_RSAPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, + RSAPublicKey_sequence, hf_index, ett_pkcs1_RSAPublicKey); + + return offset; +} + + + +static int +dissect_pkcs1_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_integer(pinfo, tree, tvb, offset, hf_index, NULL); + + return offset; +} +static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkcs1_Version(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_version); +} + +static ber_sequence RSAPrivateKey_sequence[] = { + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus }, + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent }, + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_privateExponent }, + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_prime1 }, + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_prime2 }, + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_exponent1 }, + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_exponent2 }, + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_coefficient }, + { 0, 0, 0, NULL } +}; + +int +dissect_pkcs1_RSAPrivateKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, + RSAPrivateKey_sequence, hf_index, ett_pkcs1_RSAPrivateKey); + + return offset; +} + + +static int +dissect_pkcs1_DigestAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); + + return offset; +} +static int dissect_digestAlgorithm(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkcs1_DigestAlgorithmIdentifier(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_digestAlgorithm); +} + + +static int +dissect_pkcs1_Digest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); + + return offset; +} +static int dissect_digest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkcs1_Digest(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_digest); +} + +static ber_sequence DigestInfo_sequence[] = { + { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm }, + { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_digest }, + { 0, 0, 0, NULL } +}; + +int +dissect_pkcs1_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, + DigestInfo_sequence, hf_index, ett_pkcs1_DigestInfo); + + return offset; +} + + +/*--- End of included file: packet-pkcs1-fn.c ---*/ + + +/*--- proto_register_pkcs1 ----------------------------------------------*/ +void proto_register_pkcs1(void) { + + /* List of fields */ + static hf_register_info hf[] = { + +/*--- Included file: packet-pkcs1-hfarr.c ---*/ + +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* packet-pkcs1-hfarr.c */ +/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ + + { &hf_pkcs1_modulus, + { "modulus", "pkcs1.modulus", + FT_INT32, BASE_DEC, NULL, 0, + "", HFILL }}, + { &hf_pkcs1_publicExponent, + { "publicExponent", "pkcs1.publicExponent", + FT_INT32, BASE_DEC, NULL, 0, + "", HFILL }}, + { &hf_pkcs1_version, + { "version", "pkcs1.version", + FT_INT32, BASE_DEC, NULL, 0, + "RSAPrivateKey/version", HFILL }}, + { &hf_pkcs1_privateExponent, + { "privateExponent", "pkcs1.privateExponent", + FT_INT32, BASE_DEC, NULL, 0, + "RSAPrivateKey/privateExponent", HFILL }}, + { &hf_pkcs1_prime1, + { "prime1", "pkcs1.prime1", + FT_INT32, BASE_DEC, NULL, 0, + "RSAPrivateKey/prime1", HFILL }}, + { &hf_pkcs1_prime2, + { "prime2", "pkcs1.prime2", + FT_INT32, BASE_DEC, NULL, 0, + "RSAPrivateKey/prime2", HFILL }}, + { &hf_pkcs1_exponent1, + { "exponent1", "pkcs1.exponent1", + FT_INT32, BASE_DEC, NULL, 0, + "RSAPrivateKey/exponent1", HFILL }}, + { &hf_pkcs1_exponent2, + { "exponent2", "pkcs1.exponent2", + FT_INT32, BASE_DEC, NULL, 0, + "RSAPrivateKey/exponent2", HFILL }}, + { &hf_pkcs1_coefficient, + { "coefficient", "pkcs1.coefficient", + FT_INT32, BASE_DEC, NULL, 0, + "RSAPrivateKey/coefficient", HFILL }}, + { &hf_pkcs1_digestAlgorithm, + { "digestAlgorithm", "pkcs1.digestAlgorithm", + FT_NONE, BASE_NONE, NULL, 0, + "DigestInfo/digestAlgorithm", HFILL }}, + { &hf_pkcs1_digest, + { "digest", "pkcs1.digest", + FT_BYTES, BASE_HEX, NULL, 0, + "DigestInfo/digest", HFILL }}, + +/*--- End of included file: packet-pkcs1-hfarr.c ---*/ + + }; + + /* List of subtrees */ + static gint *ett[] = { + +/*--- Included file: packet-pkcs1-ettarr.c ---*/ + +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* packet-pkcs1-ettarr.c */ +/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ + + &ett_pkcs1_RSAPublicKey, + &ett_pkcs1_RSAPrivateKey, + &ett_pkcs1_DigestInfo, + +/*--- End of included file: packet-pkcs1-ettarr.c ---*/ + + }; + + /* Register protocol */ + proto_pkcs1 = proto_register_protocol(PNAME, PSNAME, PFNAME); + + /* Register fields and subtrees */ + proto_register_field_array(proto_pkcs1, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + +} + + +/*--- proto_reg_handoff_pkcs1 -------------------------------------------*/ +void proto_reg_handoff_pkcs1(void) { + register_ber_oid_dissector("1.2.840.113549.2.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2"); + register_ber_oid_dissector("1.2.840.113549.2.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4"); + register_ber_oid_dissector("1.2.840.113549.2.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "md5"); + + register_ber_oid_dissector("1.2.840.113549.1.1.1", dissect_ber_oid_NULL_callback, proto_pkcs1, "rsaEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.3", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md5WithRSAEncryption"); + + + /* these two are not from RFC2313 but pulled in from + http://www.alvestrand.no/objectid/1.2.840.113549.1.1.html + */ + register_ber_oid_dissector("1.2.840.113549.1.1.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "shaWithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.6", dissect_ber_oid_NULL_callback, proto_pkcs1, "rsaOAEPEncryptionSET"); +} + diff --git a/epan/dissectors/packet-pkcs1.h b/epan/dissectors/packet-pkcs1.h new file mode 100644 index 0000000000..c4a6f27ec8 --- /dev/null +++ b/epan/dissectors/packet-pkcs1.h @@ -0,0 +1,52 @@ +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* packet-pkcs1.h */ +/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ + +/* Input file: packet-pkcs1-template.h */ +/* Include files: packet-pkcs1-exp.h, packet-pkcs1-valexp.h */ + +/* packet-pkcs1.h + * Routines for PKCS#1/RFC2313 packet dissection + * + * $Id: packet-pkcs1-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef PACKET_PKCS1_H +#define PACKET_PKCS1_H + + +/*--- Included file: packet-pkcs1-exp.h ---*/ + +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* packet-pkcs1-exp.h */ +/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ + +int dissect_pkcs1_RSAPublicKey(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_pkcs1_RSAPrivateKey(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_pkcs1_DigestInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); + +/*--- End of included file: packet-pkcs1-exp.h ---*/ + + +#endif /* PACKET_PKCS1_H */ + |