diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-09 03:17:51 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-03-13 21:30:24 +0000 |
commit | 54a520d4a1151c68d0b4e5f09a8d82466fa499f3 (patch) | |
tree | 7aacae160382098ce651ac862a5dfd5de4beff94 /asn1/pkixproxy | |
parent | c1f3c935bdd33090c87f0d2f84842ce9729b747a (diff) |
Move /asn1 to /epan/dissectors
Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9
Reviewed-on: https://code.wireshark.org/review/14388
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'asn1/pkixproxy')
-rw-r--r-- | asn1/pkixproxy/CMakeLists.txt | 48 | ||||
-rw-r--r-- | asn1/pkixproxy/Makefile.am | 23 | ||||
-rw-r--r-- | asn1/pkixproxy/Makefile.common | 43 | ||||
-rw-r--r-- | asn1/pkixproxy/Makefile.nmake | 26 | ||||
-rw-r--r-- | asn1/pkixproxy/PKIXProxy.asn | 69 | ||||
-rw-r--r-- | asn1/pkixproxy/packet-pkixproxy-template.c | 80 | ||||
-rw-r--r-- | asn1/pkixproxy/packet-pkixproxy-template.h | 30 | ||||
-rw-r--r-- | asn1/pkixproxy/pkixproxy.cnf | 19 |
8 files changed, 0 insertions, 338 deletions
diff --git a/asn1/pkixproxy/CMakeLists.txt b/asn1/pkixproxy/CMakeLists.txt deleted file mode 100644 index c59efe405a..0000000000 --- a/asn1/pkixproxy/CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ -# CMakeLists.txt -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# - -set( PROTOCOL_NAME pkixproxy ) - -set( PROTO_OPT ) - -set( EXT_ASN_FILE_LIST -) - -set( ASN_FILE_LIST - PKIXProxy.asn -) - -set( EXTRA_DIST - ${ASN_FILE_LIST} - packet-${PROTOCOL_NAME}-template.c - packet-${PROTOCOL_NAME}-template.h - ${PROTOCOL_NAME}.cnf -) - -set( SRC_FILES - ${EXTRA_DIST} - ${EXT_ASN_FILE_LIST} -) - -set( A2W_FLAGS -b ) - -ASN2WRS() - diff --git a/asn1/pkixproxy/Makefile.am b/asn1/pkixproxy/Makefile.am deleted file mode 100644 index 72d28e600b..0000000000 --- a/asn1/pkixproxy/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../Makefile.preinc -include Makefile.common -include ../Makefile.inc - diff --git a/asn1/pkixproxy/Makefile.common b/asn1/pkixproxy/Makefile.common deleted file mode 100644 index 9b8e8c933f..0000000000 --- a/asn1/pkixproxy/Makefile.common +++ /dev/null @@ -1,43 +0,0 @@ -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -PROTOCOL_NAME=pkixproxy - -EXT_ASN_FILE_LIST = - -ASN_FILE_LIST = \ - PKIXProxy.asn - -# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn -# files do not exist for all protocols: Please add/remove as required. -EXTRA_DIST = \ - $(EXTRA_DIST_COMMON) \ - $(ASN_FILE_LIST) \ - packet-$(PROTOCOL_NAME)-template.c \ - packet-$(PROTOCOL_NAME)-template.h \ - $(PROTOCOL_NAME).cnf - -SRC_FILES = \ - $(EXTRA_DIST) \ - $(EXT_ASN_FILE_LIST) - -A2W_FLAGS= -b - -EXTRA_CNF= - diff --git a/asn1/pkixproxy/Makefile.nmake b/asn1/pkixproxy/Makefile.nmake deleted file mode 100644 index fc70f2382f..0000000000 --- a/asn1/pkixproxy/Makefile.nmake +++ /dev/null @@ -1,26 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake - diff --git a/asn1/pkixproxy/PKIXProxy.asn b/asn1/pkixproxy/PKIXProxy.asn deleted file mode 100644 index c4f2956aaa..0000000000 --- a/asn1/pkixproxy/PKIXProxy.asn +++ /dev/null @@ -1,69 +0,0 @@ --- PKIXProxy --- This ASN.1 definition is taken from RFC3820 and modified to pass --- through the asn2wrs 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 - diff --git a/asn1/pkixproxy/packet-pkixproxy-template.c b/asn1/pkixproxy/packet-pkixproxy-template.c deleted file mode 100644 index 6b3611f16d..0000000000 --- a/asn1/pkixproxy/packet-pkixproxy-template.c +++ /dev/null @@ -1,80 +0,0 @@ -/* packet-pkixproxy.c - * Routines for RFC3820 PKIXProxy packet dissection - * Ronnie Sahlberg 2004 - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include <epan/packet.h> -#include <epan/oids.h> -#include <epan/asn1.h> - -#include "packet-ber.h" -#include "packet-pkixproxy.h" - -#define PNAME "PKIXProxy (RFC3820)" -#define PSNAME "PKIXPROXY" -#define PFNAME "pkixproxy" - -void proto_register_pkixproxy(void); -void proto_reg_handoff_pkixproxy(void); - -/* 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" - oid_add_from_string("id-ppl-anyLanguage","1.3.6.1.5.5.7.21.0"); - oid_add_from_string("id-ppl-inheritAll","1.3.6.1.5.5.7.21.1"); - oid_add_from_string("id-ppl-independent","1.3.6.1.5.5.7.21.2"); -} - diff --git a/asn1/pkixproxy/packet-pkixproxy-template.h b/asn1/pkixproxy/packet-pkixproxy-template.h deleted file mode 100644 index 75e3e674db..0000000000 --- a/asn1/pkixproxy/packet-pkixproxy-template.h +++ /dev/null @@ -1,30 +0,0 @@ -/* packet-pkixproxy.h - * Routines for RFC3820 PKIXProxy packet dissection - * Ronnie Sahlberg 2004 - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef PACKET_PKIXPROXY_H -#define PACKET_PKIXPROXY_H - -/*#include "packet-pkixproxy-exp.h"*/ - -#endif /* PACKET_PKIXPROXY_H */ - diff --git a/asn1/pkixproxy/pkixproxy.cnf b/asn1/pkixproxy/pkixproxy.cnf deleted file mode 100644 index a80fbce56f..0000000000 --- a/asn1/pkixproxy/pkixproxy.cnf +++ /dev/null @@ -1,19 +0,0 @@ -# pkixproxy.cnf -# PKIXProxy conformation file - -#.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 |