new protocol : RFC3820 PKIXProxy

svn path=/trunk/; revision=12610
This commit is contained in:
Ronnie Sahlberg 2004-11-28 04:26:27 +00:00
parent a0ad7be1d1
commit 43f6f484ac
8 changed files with 478 additions and 0 deletions

5
asn1/pkixproxy/Makefile Executable file
View File

@ -0,0 +1,5 @@
../../epan/dissectors/packet-pkixproxy.c : ../../tools/asn2eth.py PKIXProxy.asn packet-pkixproxy-template.c packet-pkixproxy-template.h pkixproxy.cnf
python ../../tools/asn2eth.py -X -b -k -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn
cp packet-pkixproxy.* ../../epan/dissectors

View File

@ -0,0 +1,69 @@
-- PKIXProxy
-- This ASN.1 definition is taken from RFC3820 and modified to pass
-- through the ASN2ETH compiler.
--
-- The original copyright of the ASN.1 module follows below:
--
-- Full Copyright Statement
--
-- Copyright (C) The Internet Society (2004). This document is subject
-- to the rights, licenses and restrictions contained in BCP 78, and
-- except as set forth therein, the authors retain all their rights.
--
-- This document and the information contained herein are provided on an
-- "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
-- OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE INTERNET
-- ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED,
-- INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
-- INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
-- WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
PKIXproxy88 { iso(1) identified-organization(3) dod(6)
internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
proxy-cert-extns(25) }
DEFINITIONS EXPLICIT TAGS ::=
BEGIN
-- EXPORTS ALL --
-- IMPORTS NONE --
-- PKIX specific OIDs
--id-pkix OBJECT IDENTIFIER ::=
-- { iso(1) identified-organization(3)
-- dod(6) internet(1) security(5) mechanisms(5) pkix(7) }
-- private certificate extensions
--id-pe OBJECT IDENTIFIER ::= { id-pkix 1 }
-- Locally defined OIDs
-- The proxy certificate extension
--id-pe-proxyCertInfo OBJECT IDENTIFIER ::= { id-pe 14 }
-- Proxy certificate policy languages
--id-ppl OBJECT IDENTIFIER ::= { id-pkix 21 }
-- Proxy certificate policies languages defined in
--id-ppl-anyLanguage OBJECT IDENTIFIER ::= { id-ppl 0 }
--id-ppl-inheritAll OBJECT IDENTIFIER ::= { id-ppl 1 }
--id-ppl-independent OBJECT IDENTIFIER ::= { id-ppl 2 }
-- The ProxyCertInfo Extension
ProxyCertInfoExtension ::= SEQUENCE {
pCPathLenConstraint ProxyCertPathLengthConstraint
OPTIONAL,
proxyPolicy ProxyPolicy }
ProxyCertPathLengthConstraint ::= INTEGER
ProxyPolicy ::= SEQUENCE {
policyLanguage OBJECT IDENTIFIER,
policy OCTET STRING OPTIONAL }
END

View File

@ -0,0 +1,83 @@
/* packet-pkixproxy.c
* Routines for RFC3820 PKIXProxy packet dissection
* Ronnie Sahlberg 2004
*
* $Id: packet-pkixproxy-template.c 12573 2004-11-22 03:36:26Z sahlberg $
*
* 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 <stdio.h>
#include <string.h>
#include "packet-ber.h"
#include "packet-pkixproxy.h"
#define PNAME "PKIXProxy (RFC3820)"
#define PSNAME "PKIXPROXY"
#define PFNAME "pkixproxy"
/* Initialize the protocol and registered fields */
static int proto_pkixproxy = -1;
#include "packet-pkixproxy-hf.c"
/* Initialize the subtree pointers */
#include "packet-pkixproxy-ett.c"
#include "packet-pkixproxy-fn.c"
/*--- proto_register_pkixproxy ----------------------------------------------*/
void proto_register_pkixproxy(void) {
/* List of fields */
static hf_register_info hf[] = {
#include "packet-pkixproxy-hfarr.c"
};
/* List of subtrees */
static gint *ett[] = {
#include "packet-pkixproxy-ettarr.c"
};
/* Register protocol */
proto_pkixproxy = proto_register_protocol(PNAME, PSNAME, PFNAME);
/* Register fields and subtrees */
proto_register_field_array(proto_pkixproxy, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
/*--- proto_reg_handoff_pkixproxy -------------------------------------------*/
void proto_reg_handoff_pkixproxy(void) {
#include "packet-pkixproxy-dis-tab.c"
register_ber_oid_name("1.3.6.1.5.5.7.21.0", "id-ppl-anyLanguage");
register_ber_oid_name("1.3.6.1.5.5.7.21.1", "id-ppl-inheritAll");
register_ber_oid_name("1.3.6.1.5.5.7.21.2", "id-ppl-independent");
}

View File

@ -0,0 +1,32 @@
/* packet-pkixproxy.h
* Routines for RFC3820 PKIXProxy packet dissection
* Ronnie Sahlberg 2004
*
* $Id: packet-pkixproxy-template.h 12573 2004-11-22 03:36:26Z sahlberg $
*
* 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_PKIXPROXY_H
#define PACKET_PKIXPROXY_H
/*#include "packet-pkixproxy-exp.h"*/
#endif /* PACKET_PKIXPROXY_H */

View File

@ -0,0 +1,21 @@
# pkixproxy.cnf
# PKIXProxy conformation file
# $Id: pkixproxy.cnf 12558 2004-11-21 10:16:06Z sahlberg $
#.MODULE_IMPORT
#.EXPORTS
#.PDU
#.REGISTER
ProxyCertInfoExtension B "1.3.6.1.5.5.7.1.14" "id-pe-proxyCertInfo"
#.NO_EMIT
#.TYPE_RENAME
#.FIELD_RENAME
#.END

View File

@ -392,6 +392,7 @@ DISSECTOR_SRC = \
packet-pkcs1.c \
packet-pkix1explicit.c \
packet-pkix1implicit.c \
packet-pkixproxy.c \
packet-pkixqualified.c \
packet-pkinit.c \
packet-pktc.c \
@ -681,6 +682,7 @@ DISSECTOR_INCLUDES = \
packet-pkcs1.h \
packet-pkix1explicit.h \
packet-pkix1implicit.h \
packet-pkixproxy.h \
packet-pkixqualified.h \
packet-pkinit.h \
packet-pktc.h \

View File

@ -0,0 +1,227 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-pkixproxy.c */
/* ../../tools/asn2eth.py -X -b -k -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */
/* Input file: packet-pkixproxy-template.c */
/* packet-pkixproxy.c
* Routines for RFC3820 PKIXProxy packet dissection
* Ronnie Sahlberg 2004
*
* $Id: packet-pkixproxy-template.c 12573 2004-11-22 03:36:26Z sahlberg $
*
* 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 <stdio.h>
#include <string.h>
#include "packet-ber.h"
#include "packet-pkixproxy.h"
#define PNAME "PKIXProxy (RFC3820)"
#define PSNAME "PKIXPROXY"
#define PFNAME "pkixproxy"
/* Initialize the protocol and registered fields */
static int proto_pkixproxy = -1;
/*--- Included file: packet-pkixproxy-hf.c ---*/
static int hf_pkixproxy_ProxyCertInfoExtension_PDU = -1; /* ProxyCertInfoExtension */
static int hf_pkixproxy_pCPathLenConstraint = -1; /* ProxyCertPathLengthConstraint */
static int hf_pkixproxy_proxyPolicy = -1; /* ProxyPolicy */
static int hf_pkixproxy_policyLanguage = -1; /* OBJECT_IDENTIFIER */
static int hf_pkixproxy_policy = -1; /* OCTET_STRING */
/*--- End of included file: packet-pkixproxy-hf.c ---*/
/* Initialize the subtree pointers */
/*--- Included file: packet-pkixproxy-ett.c ---*/
static gint ett_pkixproxy_ProxyCertInfoExtension = -1;
static gint ett_pkixproxy_ProxyPolicy = -1;
/*--- End of included file: packet-pkixproxy-ett.c ---*/
/*--- Included file: packet-pkixproxy-fn.c ---*/
/*--- Fields for imported types ---*/
static int
dissect_pkixproxy_ProxyCertPathLengthConstraint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}
static int dissect_pCPathLenConstraint(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_pkixproxy_ProxyCertPathLengthConstraint(FALSE, tvb, offset, pinfo, tree, hf_pkixproxy_pCPathLenConstraint);
}
static int
dissect_pkixproxy_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset,
hf_index, NULL);
return offset;
}
static int dissect_policyLanguage(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_pkixproxy_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_pkixproxy_policyLanguage);
}
static int
dissect_pkixproxy_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static int dissect_policy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_pkixproxy_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkixproxy_policy);
}
static const ber_sequence ProxyPolicy_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyLanguage },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policy },
{ 0, 0, 0, NULL }
};
static int
dissect_pkixproxy_ProxyPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ProxyPolicy_sequence, hf_index, ett_pkixproxy_ProxyPolicy);
return offset;
}
static int dissect_proxyPolicy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_pkixproxy_ProxyPolicy(FALSE, tvb, offset, pinfo, tree, hf_pkixproxy_proxyPolicy);
}
static const ber_sequence ProxyCertInfoExtension_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pCPathLenConstraint },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_proxyPolicy },
{ 0, 0, 0, NULL }
};
static int
dissect_pkixproxy_ProxyCertInfoExtension(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ProxyCertInfoExtension_sequence, hf_index, ett_pkixproxy_ProxyCertInfoExtension);
return offset;
}
/*--- PDUs ---*/
static void dissect_ProxyCertInfoExtension_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
dissect_pkixproxy_ProxyCertInfoExtension(FALSE, tvb, 0, pinfo, tree, hf_pkixproxy_ProxyCertInfoExtension_PDU);
}
/*--- End of included file: packet-pkixproxy-fn.c ---*/
/*--- proto_register_pkixproxy ----------------------------------------------*/
void proto_register_pkixproxy(void) {
/* List of fields */
static hf_register_info hf[] = {
/*--- Included file: packet-pkixproxy-hfarr.c ---*/
{ &hf_pkixproxy_ProxyCertInfoExtension_PDU,
{ "ProxyCertInfoExtension", "pkixproxy.ProxyCertInfoExtension",
FT_NONE, BASE_NONE, NULL, 0,
"ProxyCertInfoExtension", HFILL }},
{ &hf_pkixproxy_pCPathLenConstraint,
{ "pCPathLenConstraint", "pkixproxy.pCPathLenConstraint",
FT_INT32, BASE_DEC, NULL, 0,
"ProxyCertInfoExtension/pCPathLenConstraint", HFILL }},
{ &hf_pkixproxy_proxyPolicy,
{ "proxyPolicy", "pkixproxy.proxyPolicy",
FT_NONE, BASE_NONE, NULL, 0,
"ProxyCertInfoExtension/proxyPolicy", HFILL }},
{ &hf_pkixproxy_policyLanguage,
{ "policyLanguage", "pkixproxy.policyLanguage",
FT_STRING, BASE_NONE, NULL, 0,
"ProxyPolicy/policyLanguage", HFILL }},
{ &hf_pkixproxy_policy,
{ "policy", "pkixproxy.policy",
FT_BYTES, BASE_HEX, NULL, 0,
"ProxyPolicy/policy", HFILL }},
/*--- End of included file: packet-pkixproxy-hfarr.c ---*/
};
/* List of subtrees */
static gint *ett[] = {
/*--- Included file: packet-pkixproxy-ettarr.c ---*/
&ett_pkixproxy_ProxyCertInfoExtension,
&ett_pkixproxy_ProxyPolicy,
/*--- End of included file: packet-pkixproxy-ettarr.c ---*/
};
/* Register protocol */
proto_pkixproxy = proto_register_protocol(PNAME, PSNAME, PFNAME);
/* Register fields and subtrees */
proto_register_field_array(proto_pkixproxy, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
/*--- proto_reg_handoff_pkixproxy -------------------------------------------*/
void proto_reg_handoff_pkixproxy(void) {
/*--- Included file: packet-pkixproxy-dis-tab.c ---*/
register_ber_oid_dissector("1.3.6.1.5.5.7.1.14", dissect_ProxyCertInfoExtension_PDU, proto_pkixproxy, "id-pe-proxyCertInfo");
/*--- End of included file: packet-pkixproxy-dis-tab.c ---*/
register_ber_oid_name("1.3.6.1.5.5.7.21.0", "id-ppl-anyLanguage");
register_ber_oid_name("1.3.6.1.5.5.7.21.1", "id-ppl-inheritAll");
register_ber_oid_name("1.3.6.1.5.5.7.21.2", "id-ppl-independent");
}

View File

@ -0,0 +1,39 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-pkixproxy.h */
/* ../../tools/asn2eth.py -X -b -k -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */
/* Input file: packet-pkixproxy-template.h */
/* packet-pkixproxy.h
* Routines for RFC3820 PKIXProxy packet dissection
* Ronnie Sahlberg 2004
*
* $Id: packet-pkixproxy-template.h 12573 2004-11-22 03:36:26Z sahlberg $
*
* 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_PKIXPROXY_H
#define PACKET_PKIXPROXY_H
/*#include "packet-pkixproxy-exp.h"*/
#endif /* PACKET_PKIXPROXY_H */