diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-02-20 17:03:29 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-02-20 17:03:29 +0000 |
| commit | 5868c7d0267b997ca1d27c6eaaa50362989be969 (patch) | |
| tree | 606de6d9c54ed6fe3046a822c769f46627d85051 /asn1/x509sat | |
| parent | ba1138eb939a5162b5e1ad4dd4f07b71b0a7b0f6 (diff) | |
Renamed x411 to p1, x420 to p22 and s4406 to p772 to be consistent
on the naming policy for X.400 protocols.
svn path=/trunk/; revision=36013
Diffstat (limited to 'asn1/x509sat')
| -rw-r--r-- | asn1/x509sat/Makefile.common | 6 | ||||
| -rw-r--r-- | asn1/x509sat/packet-x509sat-template.c | 2 | ||||
| -rw-r--r-- | asn1/x509sat/x509sat.cnf | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/asn1/x509sat/Makefile.common b/asn1/x509sat/Makefile.common index c4165eb728..9e42fd87b5 100644 --- a/asn1/x509sat/Makefile.common +++ b/asn1/x509sat/Makefile.common @@ -50,11 +50,11 @@ A2W_FLAGS= -b -e -r Syntax EXTRA_CNF= \ ../x509if/x509if-exp.cnf \ - ../x411/x411-exp.cnf + ../p1/p1-exp.cnf ../x509if/x509if-exp.cnf: (cd ../x509if && $(MAKE_CNF_EXPORT)) -../x411/x411-exp.cnf: - (cd ../x411 && $(MAKE_CNF_EXPORT)) +../p1/p1-exp.cnf: + (cd ../p1 && $(MAKE_CNF_EXPORT)) diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index 726874c3dd..5eac5a7848 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -33,7 +33,7 @@ #include <epan/asn1.h> #include "packet-ber.h" -#include "packet-x411.h" +#include "packet-p1.h" #include "packet-x509sat.h" #include "packet-x509if.h" diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf index c551eb4e5f..932087617d 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -7,7 +7,7 @@ GUID TYPE = FT_GUID DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 #.IMPORT ../x509if/x509if-exp.cnf -#.IMPORT ../x411/x411-exp.cnf +#.IMPORT ../p1/p1-exp.cnf #.CLASS CONTEXT &Type @@ -320,7 +320,7 @@ Integer B "1.2.826.0.1063.7.0.0.0" "unknown-UK-organisation-defined-extension" # NEXOR Originating UA SyntaxIA5String B "1.2.826.0.1004.10.1.1" "nexor-originating-ua" -# X.420 Message Store Attributes - see x420.cnf +# X.420 Message Store Attributes - see p22.cnf Boolean B "2.6.1.6.3" "id-sat-ipm-auto-discarded" # RFC 4530 |