From d7044099b8da0e5ea38b46764fd005698dc8c612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Fri, 26 Feb 2010 16:08:45 +0000 Subject: asn1 tests: use consistent line endings Some files used by the asn1 test suite had mixed DOS and Unix line endings. Noticed-by: Richard Carlsson --- lib/asn1/test/asn1_SUITE_data/P-Record.py | 66 +++++++++++----------- lib/asn1/test/asn1_SUITE_data/XSeq.py | 72 ++++++++++++------------ lib/asn1/test/asn1_SUITE_data/XSeqOf.py | 28 ++++----- lib/asn1/test/asn1_bin_SUITE_data/P-Record.py | 66 +++++++++++----------- lib/asn1/test/asn1_bin_SUITE_data/XSeq.py | 72 ++++++++++++------------ lib/asn1/test/asn1_bin_SUITE_data/XSeqOf.py | 28 ++++----- lib/asn1/test/asn1_bin_v2_SUITE_data/P-Record.py | 66 +++++++++++----------- lib/asn1/test/asn1_bin_v2_SUITE_data/XSeq.py | 72 ++++++++++++------------ lib/asn1/test/asn1_bin_v2_SUITE_data/XSeqOf.py | 28 ++++----- 9 files changed, 249 insertions(+), 249 deletions(-) (limited to 'lib/asn1') diff --git a/lib/asn1/test/asn1_SUITE_data/P-Record.py b/lib/asn1/test/asn1_SUITE_data/P-Record.py index f1db09ac6c..ac3dc9abe0 100644 --- a/lib/asn1/test/asn1_SUITE_data/P-Record.py +++ b/lib/asn1/test/asn1_SUITE_data/P-Record.py @@ -1,44 +1,44 @@ -P-Record DEFINITIONS ::= -BEGIN - - -PersonnelRecord ::= [APPLICATION 0] SET -{ name Name, - title VisibleString, - number EmployeeNumber, - dateOfHire Date, - nameOfSpouse [1] Name, - children SEQUENCE OF ChildInformation DEFAULT {} -} - -ChildInformation ::= SET -{ name Name, - dateOfBirth Date -} - -Name ::= [APPLICATION 1] SEQUENCE -{ givenName VisibleString, - initial VisibleString, - familyName VisibleString -} - -EmployeeNumber ::= [APPLICATION 2] INTEGER -Date ::= [APPLICATION 3] VisibleString -- YYYY MMDD +P-Record DEFINITIONS ::= +BEGIN + + +PersonnelRecord ::= [APPLICATION 0] SET +{ name Name, + title VisibleString, + number EmployeeNumber, + dateOfHire Date, + nameOfSpouse [1] Name, + children SEQUENCE OF ChildInformation DEFAULT {} +} + +ChildInformation ::= SET +{ name Name, + dateOfBirth Date +} + +Name ::= [APPLICATION 1] SEQUENCE +{ givenName VisibleString, + initial VisibleString, + familyName VisibleString +} + +EmployeeNumber ::= [APPLICATION 2] INTEGER +Date ::= [APPLICATION 3] VisibleString -- YYYY MMDD v PersonnelRecord ::= { name { - givenName "John", - initial "P", - familyName "Smith" + givenName "John", + initial "P", + familyName "Smith" }, title "Director", number 51, - dateOfHire "19710917", + dateOfHire "19710917", nameOfSpouse { - givenName "Mary", - initial "T", - familyName "Smith" + givenName "Mary", + initial "T", + familyName "Smith" }, children { {name { diff --git a/lib/asn1/test/asn1_SUITE_data/XSeq.py b/lib/asn1/test/asn1_SUITE_data/XSeq.py index b068ab4393..35b4469440 100644 --- a/lib/asn1/test/asn1_SUITE_data/XSeq.py +++ b/lib/asn1/test/asn1_SUITE_data/XSeq.py @@ -1,42 +1,42 @@ -XSeq DEFINITIONS ::= -BEGIN - --- F.2.10.2 --- Use a sequence type to model a collection of variables whose --- types are the same, --- whose number is known and modest, and whose order is significant, --- provided that the --- makeup of the collection is unlikely to change from one version --- of the protocol to the next. --- EXAMPLE - -NamesOfOfficers ::= SEQUENCE { - president VisibleString, - vicePresident VisibleString, - secretary VisibleString} - -acmeCorp NamesOfOfficers ::= { - president "Jane Doe", - vicePresident "John Doe", - secretary "Joe Doe"} - --- F.2.10.3 --- Use a sequence type to model a collection of variables whose types differ, --- whose number is known and modest, and whose order is significant, --- provided that --- the makeup of the collection is unlikely to change from one version --- of the protocol to the next. --- EXAMPLE - -Credentials ::= SEQUENCE { - userName VisibleString, - password VisibleString, - accountNumber INTEGER} - +XSeq DEFINITIONS ::= +BEGIN + +-- F.2.10.2 +-- Use a sequence type to model a collection of variables whose +-- types are the same, +-- whose number is known and modest, and whose order is significant, +-- provided that the +-- makeup of the collection is unlikely to change from one version +-- of the protocol to the next. +-- EXAMPLE + +NamesOfOfficers ::= SEQUENCE { + president VisibleString, + vicePresident VisibleString, + secretary VisibleString} + +acmeCorp NamesOfOfficers ::= { + president "Jane Doe", + vicePresident "John Doe", + secretary "Joe Doe"} + +-- F.2.10.3 +-- Use a sequence type to model a collection of variables whose types differ, +-- whose number is known and modest, and whose order is significant, +-- provided that +-- the makeup of the collection is unlikely to change from one version +-- of the protocol to the next. +-- EXAMPLE + +Credentials ::= SEQUENCE { + userName VisibleString, + password VisibleString, + accountNumber INTEGER} + -- Empty SEQUENCE stupid but just for test BasicCallCategories ::= SEQUENCE { ... -- So far, no specific categories identified } -END +END diff --git a/lib/asn1/test/asn1_SUITE_data/XSeqOf.py b/lib/asn1/test/asn1_SUITE_data/XSeqOf.py index f9fee92e56..116bd4a82d 100644 --- a/lib/asn1/test/asn1_SUITE_data/XSeqOf.py +++ b/lib/asn1/test/asn1_SUITE_data/XSeqOf.py @@ -1,19 +1,19 @@ -XSeqOf DEFINITIONS ::= -BEGIN - --- F.2.10.1 --- Use a sequence-of type to model a collection of variables whose --- types are the same, --- whose number is large or unpredictable, and whose order is significant. --- EXAMPLE - -NamesOfMemberNations ::= SEQUENCE OF VisibleString --- in alphabetical order - -firstTwo NamesOfMemberNations ::= {"Australia", "Austria"} +XSeqOf DEFINITIONS ::= +BEGIN + +-- F.2.10.1 +-- Use a sequence-of type to model a collection of variables whose +-- types are the same, +-- whose number is large or unpredictable, and whose order is significant. +-- EXAMPLE + +NamesOfMemberNations ::= SEQUENCE OF VisibleString +-- in alphabetical order + +firstTwo NamesOfMemberNations ::= {"Australia", "Austria"} DayNames1 ::= SEQUENCE SIZE(7) OF VisibleString DayNames2 ::= SEQUENCE SIZE(1..7) OF VisibleString DayNames3 ::= SEQUENCE (SIZE(7)) OF VisibleString DayNames4 ::= SEQUENCE (SIZE(1..7)) OF VisibleString -END +END diff --git a/lib/asn1/test/asn1_bin_SUITE_data/P-Record.py b/lib/asn1/test/asn1_bin_SUITE_data/P-Record.py index f1db09ac6c..ac3dc9abe0 100644 --- a/lib/asn1/test/asn1_bin_SUITE_data/P-Record.py +++ b/lib/asn1/test/asn1_bin_SUITE_data/P-Record.py @@ -1,44 +1,44 @@ -P-Record DEFINITIONS ::= -BEGIN - - -PersonnelRecord ::= [APPLICATION 0] SET -{ name Name, - title VisibleString, - number EmployeeNumber, - dateOfHire Date, - nameOfSpouse [1] Name, - children SEQUENCE OF ChildInformation DEFAULT {} -} - -ChildInformation ::= SET -{ name Name, - dateOfBirth Date -} - -Name ::= [APPLICATION 1] SEQUENCE -{ givenName VisibleString, - initial VisibleString, - familyName VisibleString -} - -EmployeeNumber ::= [APPLICATION 2] INTEGER -Date ::= [APPLICATION 3] VisibleString -- YYYY MMDD +P-Record DEFINITIONS ::= +BEGIN + + +PersonnelRecord ::= [APPLICATION 0] SET +{ name Name, + title VisibleString, + number EmployeeNumber, + dateOfHire Date, + nameOfSpouse [1] Name, + children SEQUENCE OF ChildInformation DEFAULT {} +} + +ChildInformation ::= SET +{ name Name, + dateOfBirth Date +} + +Name ::= [APPLICATION 1] SEQUENCE +{ givenName VisibleString, + initial VisibleString, + familyName VisibleString +} + +EmployeeNumber ::= [APPLICATION 2] INTEGER +Date ::= [APPLICATION 3] VisibleString -- YYYY MMDD v PersonnelRecord ::= { name { - givenName "John", - initial "P", - familyName "Smith" + givenName "John", + initial "P", + familyName "Smith" }, title "Director", number 51, - dateOfHire "19710917", + dateOfHire "19710917", nameOfSpouse { - givenName "Mary", - initial "T", - familyName "Smith" + givenName "Mary", + initial "T", + familyName "Smith" }, children { {name { diff --git a/lib/asn1/test/asn1_bin_SUITE_data/XSeq.py b/lib/asn1/test/asn1_bin_SUITE_data/XSeq.py index b068ab4393..35b4469440 100644 --- a/lib/asn1/test/asn1_bin_SUITE_data/XSeq.py +++ b/lib/asn1/test/asn1_bin_SUITE_data/XSeq.py @@ -1,42 +1,42 @@ -XSeq DEFINITIONS ::= -BEGIN - --- F.2.10.2 --- Use a sequence type to model a collection of variables whose --- types are the same, --- whose number is known and modest, and whose order is significant, --- provided that the --- makeup of the collection is unlikely to change from one version --- of the protocol to the next. --- EXAMPLE - -NamesOfOfficers ::= SEQUENCE { - president VisibleString, - vicePresident VisibleString, - secretary VisibleString} - -acmeCorp NamesOfOfficers ::= { - president "Jane Doe", - vicePresident "John Doe", - secretary "Joe Doe"} - --- F.2.10.3 --- Use a sequence type to model a collection of variables whose types differ, --- whose number is known and modest, and whose order is significant, --- provided that --- the makeup of the collection is unlikely to change from one version --- of the protocol to the next. --- EXAMPLE - -Credentials ::= SEQUENCE { - userName VisibleString, - password VisibleString, - accountNumber INTEGER} - +XSeq DEFINITIONS ::= +BEGIN + +-- F.2.10.2 +-- Use a sequence type to model a collection of variables whose +-- types are the same, +-- whose number is known and modest, and whose order is significant, +-- provided that the +-- makeup of the collection is unlikely to change from one version +-- of the protocol to the next. +-- EXAMPLE + +NamesOfOfficers ::= SEQUENCE { + president VisibleString, + vicePresident VisibleString, + secretary VisibleString} + +acmeCorp NamesOfOfficers ::= { + president "Jane Doe", + vicePresident "John Doe", + secretary "Joe Doe"} + +-- F.2.10.3 +-- Use a sequence type to model a collection of variables whose types differ, +-- whose number is known and modest, and whose order is significant, +-- provided that +-- the makeup of the collection is unlikely to change from one version +-- of the protocol to the next. +-- EXAMPLE + +Credentials ::= SEQUENCE { + userName VisibleString, + password VisibleString, + accountNumber INTEGER} + -- Empty SEQUENCE stupid but just for test BasicCallCategories ::= SEQUENCE { ... -- So far, no specific categories identified } -END +END diff --git a/lib/asn1/test/asn1_bin_SUITE_data/XSeqOf.py b/lib/asn1/test/asn1_bin_SUITE_data/XSeqOf.py index f9fee92e56..116bd4a82d 100644 --- a/lib/asn1/test/asn1_bin_SUITE_data/XSeqOf.py +++ b/lib/asn1/test/asn1_bin_SUITE_data/XSeqOf.py @@ -1,19 +1,19 @@ -XSeqOf DEFINITIONS ::= -BEGIN - --- F.2.10.1 --- Use a sequence-of type to model a collection of variables whose --- types are the same, --- whose number is large or unpredictable, and whose order is significant. --- EXAMPLE - -NamesOfMemberNations ::= SEQUENCE OF VisibleString --- in alphabetical order - -firstTwo NamesOfMemberNations ::= {"Australia", "Austria"} +XSeqOf DEFINITIONS ::= +BEGIN + +-- F.2.10.1 +-- Use a sequence-of type to model a collection of variables whose +-- types are the same, +-- whose number is large or unpredictable, and whose order is significant. +-- EXAMPLE + +NamesOfMemberNations ::= SEQUENCE OF VisibleString +-- in alphabetical order + +firstTwo NamesOfMemberNations ::= {"Australia", "Austria"} DayNames1 ::= SEQUENCE SIZE(7) OF VisibleString DayNames2 ::= SEQUENCE SIZE(1..7) OF VisibleString DayNames3 ::= SEQUENCE (SIZE(7)) OF VisibleString DayNames4 ::= SEQUENCE (SIZE(1..7)) OF VisibleString -END +END diff --git a/lib/asn1/test/asn1_bin_v2_SUITE_data/P-Record.py b/lib/asn1/test/asn1_bin_v2_SUITE_data/P-Record.py index f1db09ac6c..ac3dc9abe0 100644 --- a/lib/asn1/test/asn1_bin_v2_SUITE_data/P-Record.py +++ b/lib/asn1/test/asn1_bin_v2_SUITE_data/P-Record.py @@ -1,44 +1,44 @@ -P-Record DEFINITIONS ::= -BEGIN - - -PersonnelRecord ::= [APPLICATION 0] SET -{ name Name, - title VisibleString, - number EmployeeNumber, - dateOfHire Date, - nameOfSpouse [1] Name, - children SEQUENCE OF ChildInformation DEFAULT {} -} - -ChildInformation ::= SET -{ name Name, - dateOfBirth Date -} - -Name ::= [APPLICATION 1] SEQUENCE -{ givenName VisibleString, - initial VisibleString, - familyName VisibleString -} - -EmployeeNumber ::= [APPLICATION 2] INTEGER -Date ::= [APPLICATION 3] VisibleString -- YYYY MMDD +P-Record DEFINITIONS ::= +BEGIN + + +PersonnelRecord ::= [APPLICATION 0] SET +{ name Name, + title VisibleString, + number EmployeeNumber, + dateOfHire Date, + nameOfSpouse [1] Name, + children SEQUENCE OF ChildInformation DEFAULT {} +} + +ChildInformation ::= SET +{ name Name, + dateOfBirth Date +} + +Name ::= [APPLICATION 1] SEQUENCE +{ givenName VisibleString, + initial VisibleString, + familyName VisibleString +} + +EmployeeNumber ::= [APPLICATION 2] INTEGER +Date ::= [APPLICATION 3] VisibleString -- YYYY MMDD v PersonnelRecord ::= { name { - givenName "John", - initial "P", - familyName "Smith" + givenName "John", + initial "P", + familyName "Smith" }, title "Director", number 51, - dateOfHire "19710917", + dateOfHire "19710917", nameOfSpouse { - givenName "Mary", - initial "T", - familyName "Smith" + givenName "Mary", + initial "T", + familyName "Smith" }, children { {name { diff --git a/lib/asn1/test/asn1_bin_v2_SUITE_data/XSeq.py b/lib/asn1/test/asn1_bin_v2_SUITE_data/XSeq.py index b068ab4393..35b4469440 100644 --- a/lib/asn1/test/asn1_bin_v2_SUITE_data/XSeq.py +++ b/lib/asn1/test/asn1_bin_v2_SUITE_data/XSeq.py @@ -1,42 +1,42 @@ -XSeq DEFINITIONS ::= -BEGIN - --- F.2.10.2 --- Use a sequence type to model a collection of variables whose --- types are the same, --- whose number is known and modest, and whose order is significant, --- provided that the --- makeup of the collection is unlikely to change from one version --- of the protocol to the next. --- EXAMPLE - -NamesOfOfficers ::= SEQUENCE { - president VisibleString, - vicePresident VisibleString, - secretary VisibleString} - -acmeCorp NamesOfOfficers ::= { - president "Jane Doe", - vicePresident "John Doe", - secretary "Joe Doe"} - --- F.2.10.3 --- Use a sequence type to model a collection of variables whose types differ, --- whose number is known and modest, and whose order is significant, --- provided that --- the makeup of the collection is unlikely to change from one version --- of the protocol to the next. --- EXAMPLE - -Credentials ::= SEQUENCE { - userName VisibleString, - password VisibleString, - accountNumber INTEGER} - +XSeq DEFINITIONS ::= +BEGIN + +-- F.2.10.2 +-- Use a sequence type to model a collection of variables whose +-- types are the same, +-- whose number is known and modest, and whose order is significant, +-- provided that the +-- makeup of the collection is unlikely to change from one version +-- of the protocol to the next. +-- EXAMPLE + +NamesOfOfficers ::= SEQUENCE { + president VisibleString, + vicePresident VisibleString, + secretary VisibleString} + +acmeCorp NamesOfOfficers ::= { + president "Jane Doe", + vicePresident "John Doe", + secretary "Joe Doe"} + +-- F.2.10.3 +-- Use a sequence type to model a collection of variables whose types differ, +-- whose number is known and modest, and whose order is significant, +-- provided that +-- the makeup of the collection is unlikely to change from one version +-- of the protocol to the next. +-- EXAMPLE + +Credentials ::= SEQUENCE { + userName VisibleString, + password VisibleString, + accountNumber INTEGER} + -- Empty SEQUENCE stupid but just for test BasicCallCategories ::= SEQUENCE { ... -- So far, no specific categories identified } -END +END diff --git a/lib/asn1/test/asn1_bin_v2_SUITE_data/XSeqOf.py b/lib/asn1/test/asn1_bin_v2_SUITE_data/XSeqOf.py index f9fee92e56..116bd4a82d 100644 --- a/lib/asn1/test/asn1_bin_v2_SUITE_data/XSeqOf.py +++ b/lib/asn1/test/asn1_bin_v2_SUITE_data/XSeqOf.py @@ -1,19 +1,19 @@ -XSeqOf DEFINITIONS ::= -BEGIN - --- F.2.10.1 --- Use a sequence-of type to model a collection of variables whose --- types are the same, --- whose number is large or unpredictable, and whose order is significant. --- EXAMPLE - -NamesOfMemberNations ::= SEQUENCE OF VisibleString --- in alphabetical order - -firstTwo NamesOfMemberNations ::= {"Australia", "Austria"} +XSeqOf DEFINITIONS ::= +BEGIN + +-- F.2.10.1 +-- Use a sequence-of type to model a collection of variables whose +-- types are the same, +-- whose number is large or unpredictable, and whose order is significant. +-- EXAMPLE + +NamesOfMemberNations ::= SEQUENCE OF VisibleString +-- in alphabetical order + +firstTwo NamesOfMemberNations ::= {"Australia", "Austria"} DayNames1 ::= SEQUENCE SIZE(7) OF VisibleString DayNames2 ::= SEQUENCE SIZE(1..7) OF VisibleString DayNames3 ::= SEQUENCE (SIZE(7)) OF VisibleString DayNames4 ::= SEQUENCE (SIZE(1..7)) OF VisibleString -END +END -- cgit v1.2.3