diff --git a/epan/dissectors/asn1/pkinit/PKINIT.asn b/epan/dissectors/asn1/pkinit/PKINIT.asn index ff25738fb8..686ff9b400 100644 --- a/epan/dissectors/asn1/pkinit/PKINIT.asn +++ b/epan/dissectors/asn1/pkinit/PKINIT.asn @@ -1,8 +1,8 @@ ---NOTE: we have to accomodate BOTH existing users of early drafts, such as +--NOTE: we have to accommodate BOTH existing users of early drafts, such as --packetcable as well as new users once the protocol is standardized. -- --This asn1 file is based on draft-ietf-cat-kerberos-pk-init-20.txt ---but has been modified to acocmodate the Wireshark asn2wrs compiler +--but has been modified to accommodate the Wireshark asn2wrs compiler --and our environment -- --new structures are uncommented and added on demand as they are required @@ -18,13 +18,13 @@ --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. +--WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -- KerberosV5-PK-INIT-SPEC { iso(1) identified-organization(3) dod(6) internet(1) - security(5) kerberosV5(2) modules(4) pkinit(5) } -DEFINITIONS EXPLICIT TAGS ::= + security(5) kerberosV5(2) modules(4) pkinit(5) } +DEFINITIONS EXPLICIT TAGS ::= BEGIN diff --git a/epan/dissectors/asn1/pkix1explicit/PKIX1EXPLICIT93.asn b/epan/dissectors/asn1/pkix1explicit/PKIX1EXPLICIT93.asn index 6cc643e6ad..030640a701 100644 --- a/epan/dissectors/asn1/pkix1explicit/PKIX1EXPLICIT93.asn +++ b/epan/dissectors/asn1/pkix1explicit/PKIX1EXPLICIT93.asn @@ -32,18 +32,18 @@ -- -- --NOTE: This ASN1 definition have been significantly modified from the original ---version in RFC2459 in order to accomodate the featuresets available +--version in RFC2459 in order to accommodate the feature sets available --in the Wireshark projects asn2wrs compiler. --It has also been modified and structures have been commented out that --are already implemented in the X509 dissectors. ---Dissectors present already in the X509 dissectors should be implemented in +--Dissectors present already in the X509 dissectors should be implemented in --the template by hand as stubs that will just call the original --dissector functions in X509 in order not to duplicate code. -- ---Structures and constructs in this definition are uncommented and +--Structures and constructs in this definition are uncommented and --implemented on-demand when someone needs them. -- ---If you export new types from this file, make sure to update the +--If you export new types from this file, make sure to update the --pkix1explicit_exp.cnf file with the proper definitions @@ -151,7 +151,7 @@ Extensions ::= SEQUENCE OF Extension Extension ::= SEQUENCE { extnId OBJECT IDENTIFIER, critical BOOLEAN DEFAULT FALSE, - extnValue OCTET STRING + extnValue OCTET STRING } -- contains a DER encoding of a value of type @@ -187,7 +187,7 @@ Extension ::= SEQUENCE { -- Certificate Revocation List -- --CertificateList ::= SIGNED { SEQUENCE { --- version Version OPTIONAL, +-- version Version OPTIONAL, -- if present, shall be v2 -- signature AlgorithmIdentifier, -- issuer Name, @@ -207,7 +207,7 @@ Extension ::= SEQUENCE { -- extnValue OCTET STRING } -- contains a DER encoding of a value of type -- &ExtnType for the --- extension object identified by extnId +-- extension object identified by extnId -- -- The following information object set is defined to constrain the -- set of legal CRL extensions. @@ -228,7 +228,7 @@ Extension ::= SEQUENCE { -- extnValue OCTET STRING } -- contains a DER encoding of a value of type -- &ExtnType for the --- extension object identified by extnId +-- extension object identified by extnId -- -- The following information object set is defined to constrain the -- set of legal CRL entry extensions. @@ -238,10 +238,10 @@ Extension ::= SEQUENCE { -- invalidityDate | -- certificateIssuer } -- --- information object classes used in the defintion --- of certificates and CRLs +-- information object classes used in the defintion +-- of certificates and CRLs -- --- Parameterized Type SIGNED +-- Parameterized Type SIGNED -- -- SIGNED { ToBeSigned } ::= SEQUENCE { -- toBeSigned ToBeSigned, @@ -257,7 +257,7 @@ Extension ::= SEQUENCE { --AlgorithmIdentifier ::= SEQUENCE { -- algorithm ALGORITHM.&id({SupportedAlgorithms}), -- parameters ALGORITHM.&Type({SupportedAlgorithms} --- { @algorithm}) OPTIONAL +-- { @algorithm}) OPTIONAL --} -- Definition of ALGORITHM @@ -284,7 +284,7 @@ Extension ::= SEQUENCE { -- the set is specified as extensible, since additional algorithms -- may be supported -- ---SupportedAlgorithms ALGORITHM-ID ::= { ..., +--SupportedAlgorithms ALGORITHM-ID ::= { ..., -- rsaPublicKey | -- rsaSHA-1 | -- rsaMD5 | @@ -334,9 +334,9 @@ dhpublicnumber OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) ansi-x942(10046) number-type(2) 1 } DomainParameters ::= SEQUENCE { - p INTEGER, - g INTEGER, - q INTEGER, + p INTEGER, + g INTEGER, + q INTEGER, j INTEGER OPTIONAL, validationParms ValidationParms OPTIONAL } @@ -355,7 +355,7 @@ ValidationParms ::= SEQUENCE { -- The ASN.1 in this section supports the Name type -- and the directoryAttribute extension -- --- attribute data types +-- attribute data types -- --Attribute ::= SEQUENCE { -- type ATTRIBUTE.&id ({SupportedAttributes}), @@ -378,8 +378,8 @@ AttributeTypeAndValue ::= SEQUENCE { -- This one is implemented in the template as just a call to the -- corresponding function in x509 ---Name ::= CHOICE { --- rdnSequence RDNSequence +--Name ::= CHOICE { +-- rdnSequence RDNSequence --} @@ -478,11 +478,11 @@ RelativeDistinguishedName ::= SET OF AttributeTypeAndValue -- -- object identifiers for Name type and directory attribute support -- --- Object identifier assignments +-- Object identifier assignments -- --id-at OBJECT IDENTIFIER ::= {joint-iso-ccitt(2) ds(5) 4} -- --- Attributes +-- Attributes -- --id-at-commonName OBJECT IDENTIFIER ::= {id-at 3} --id-at-surname OBJECT IDENTIFIER ::= {id-at 4} @@ -498,7 +498,7 @@ RelativeDistinguishedName ::= SET OF AttributeTypeAndValue --id-at-generationQualifier OBJECT IDENTIFIER ::= {id-at 44} --id-at-dnQualifier OBJECT IDENTIFIER ::= {id-at 46} -- --- Directory string type, used extensively in Name types +-- Directory string type, used extensively in Name types --Make it a PrintableString will amke it look prettier DirectoryString ::= PrintableString --DirectoryString { INTEGER:maxSize } ::= CHOICE { @@ -509,11 +509,11 @@ DirectoryString ::= PrintableString -- utf8String UTF8String (SIZE(1..maxSize)) -- } -- --- End of ASN.1 for Name type and directory attribute support +-- End of ASN.1 for Name type and directory attribute support -- --- The ASN.1 in this section supports X.400 style names --- for implementations that use the x400Address component --- of GeneralName. +-- The ASN.1 in this section supports X.400 style names +-- for implementations that use the x400Address component +-- of GeneralName. -- --ORAddress ::= SEQUENCE { -- built-in-standard-attributes BuiltInStandardAttributes, @@ -542,7 +542,7 @@ DirectoryString ::= PrintableString -- personal-name [5] PersonalName OPTIONAL, -- see also teletex-personal-name -- organizational-unit-names [6] OrganizationalUnitNames OPTIONAL --- see also teletex-organizational-unit-names +-- see also teletex-organizational-unit-names -- } -- --CountryName ::= [APPLICATION 1] CHOICE { diff --git a/epan/dissectors/asn1/pkix1implicit/PKIX1IMPLICIT93.asn b/epan/dissectors/asn1/pkix1implicit/PKIX1IMPLICIT93.asn index 23b8a402f1..2856cc7b4a 100644 --- a/epan/dissectors/asn1/pkix1implicit/PKIX1IMPLICIT93.asn +++ b/epan/dissectors/asn1/pkix1implicit/PKIX1IMPLICIT93.asn @@ -32,18 +32,18 @@ -- -- --NOTE: This ASN1 definition have been significantly modified from the original ---version in RFC2459 in order to accomodate the featuresets available +--version in RFC2459 in order to accommodate the feature sets available --in the Wireshark projects asn2wrs compiler. --It has also been modified and structures have been commented out that --are already implemented in the X509 dissectors. ---Dissectors present already in the X509 dissectors should be implemented in +--Dissectors present already in the X509 dissectors should be implemented in --the template by hand as stubs that will just call the original --dissector functions in X509 in order not to duplicate code. -- ---Structures and constructs in this definition are uncommented and +--Structures and constructs in this definition are uncommented and --implemented on-demand when someone needs them. -- ---If you export new types from this file, make sure to update the +--If you export new types from this file, make sure to update the --pkix1implicit_exp.cnf file with the proper definitions @@ -172,7 +172,7 @@ Dummy ::= NULL -- issuerDomainPolicy CertPolicyId, -- subjectDomainPolicy CertPolicyId } -- --- Certificate subject and certificate issuer attributes extensions +-- Certificate subject and certificate issuer attributes extensions -- --subjectAltName EXTENSION ::= { -- SYNTAX GeneralNames @@ -190,7 +190,7 @@ Dummy ::= NULL -- ediPartyName [5] EDIPartyName, -- uniformResourceIdentifier [6] IA5String, -- iPAddress [7] OCTET STRING, --- registeredID [8] OBJECT IDENTIFIER +-- registeredID [8] OBJECT IDENTIFIER --} --OTHER-NAME ::= TYPE-IDENTIFIER @@ -209,7 +209,7 @@ EDIPartyName ::= SEQUENCE { -- --AttributesSyntax ::= SEQUENCE SIZE (1..MAX) OF Attribute -- --- Certification path constraints extensions +-- Certification path constraints extensions -- --basicConstraints EXTENSION ::= { -- SYNTAX BasicConstraintsSyntax @@ -247,7 +247,7 @@ EDIPartyName ::= SEQUENCE { -- --SkipCerts ::= INTEGER (0..MAX) -- --- Basic CRL extensions +-- Basic CRL extensions -- --cRLNumber EXTENSION ::= { -- SYNTAX CRLNumber @@ -290,7 +290,7 @@ EDIPartyName ::= SEQUENCE { -- SYNTAX GeneralizedTime -- IDENTIFIED BY id-ce-invalidityDate } -- --- CRL distribution points and delta-CRL extensions +-- CRL distribution points and delta-CRL extensions -- --cRLDistributionPoints EXTENSION ::= { -- @@ -338,7 +338,7 @@ EDIPartyName ::= SEQUENCE { -- --BaseCRLNumber ::= CRLNumber -- --- Object identifier assignments for ISO certificate extensions +-- Object identifier assignments for ISO certificate extensions --id-ce OBJECT IDENTIFIER ::= {joint-iso-ccitt(2) ds(5) 29} -- --id-ce-subjectDirectoryAttributes OBJECT IDENTIFIER ::= {id-ce 9} diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index fffb2eff55..288ea87561 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -40575,7 +40575,7 @@ dissect_ieee80211_withoutfcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree * - Packets that are supposed to be received by another computer have * the 802.11/LLC headers. ... Also I noticed that when WEP is enabled, * the 802.11 header has the flag "WEP" set to true, but the packet - * is already decrypted. I added a test in the code to accomodate this. + * is already decrypted. I added a test in the code to accommodate this. * For TKIP it seems to stay encrypted. */ static int diff --git a/epan/dissectors/packet-lbmsrs.c b/epan/dissectors/packet-lbmsrs.c index ea9b006d4b..37b0e74635 100644 --- a/epan/dissectors/packet-lbmsrs.c +++ b/epan/dissectors/packet-lbmsrs.c @@ -2465,8 +2465,8 @@ static int dissect_lbmsrs_pdus(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /*get the rsocket frame length*/ guint32 rsocket_frame_len = tvb_get_guint24(tvb, offset, ENC_BIG_ENDIAN); - /*adjust the rscoket tree size correctly so as to accomodate - only the available data, its always possible that the rsocket length reported + /*adjust the rsocket tree size correctly so as to accommodate + only the available data. It's always possible that the rsocket length reported in the rsocket PDU is more than the data captured in this packet or vice-versa*/ guint32 rsocket_tree_length = rsocket_frame_len; if (tvb_length < (rsocket_frame_len + rsocket_frame_len_field_size)) diff --git a/epan/dissectors/packet-ncsi.c b/epan/dissectors/packet-ncsi.c index 71c46e72c1..46a32c9182 100644 --- a/epan/dissectors/packet-ncsi.c +++ b/epan/dissectors/packet-ncsi.c @@ -405,7 +405,7 @@ static const value_string ncsi_partner_flow_vals[] = { { 0x00, "Not pause capable" }, { 0x01, "Symmetric pause" }, { 0x02, "Asymmetric pause" }, - { 0x03, "Symmetric & Assymetric pause" }, + { 0x03, "Symmetric & Asymmetric pause" }, { 0, NULL }, }; diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 7adbf20e86..0a4fcf09ff 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -2681,7 +2681,7 @@ dissect_selfm_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat /* Check if additional data is actually selfm PDU data */ if (tvb_get_guint8(selfm_tvb, selfm_PDU_len) == 0xA5) { new_selfm_PDU_len = tvb_get_guint8(selfm_tvb, selfm_PDU_len+2); - /* If we still don't have enough data to accomodate the 2 PDUs... */ + /* If we still don't have enough data to accommodate the 2 PDUs... */ if (selfm_tvb_len < (selfm_PDU_len + new_selfm_PDU_len)) { #if 0 fprintf(stderr, "On Packet: %d, continuing to desegment. PDU: %d NewPDU: %d Still need %d bytes.. \n", pinfo->fd->num, selfm_PDU_len, new_selfm_PDU_len, (selfm_PDU_len + new_selfm_PDU_len) - selfm_tvb_len); diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 8796c4cefd..d76c334e9f 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -492,7 +492,7 @@ static int hf_smb2_share_caps_dfs; static int hf_smb2_share_caps_continuous_availability; static int hf_smb2_share_caps_scaleout; static int hf_smb2_share_caps_cluster; -static int hf_smb2_share_caps_assymetric; +static int hf_smb2_share_caps_asymmetric; static int hf_smb2_share_caps_redirect_to_owner; static int hf_smb2_create_flags; static int hf_smb2_lock_count; @@ -3718,7 +3718,7 @@ dissect_smb2_share_flags(proto_tree *tree, tvbuff_t *tvb, int offset) #define SHARE_CAPS_CONTINUOUS_AVAILABILITY 0x00000010 #define SHARE_CAPS_SCALEOUT 0x00000020 #define SHARE_CAPS_CLUSTER 0x00000040 -#define SHARE_CAPS_ASSYMETRIC 0x00000080 +#define SHARE_CAPS_ASYMMETRIC 0x00000080 #define SHARE_CAPS_REDIRECT_TO_OWNER 0x00000100 static int @@ -3729,7 +3729,7 @@ dissect_smb2_share_caps(proto_tree *tree, tvbuff_t *tvb, int offset) &hf_smb2_share_caps_continuous_availability, &hf_smb2_share_caps_scaleout, &hf_smb2_share_caps_cluster, - &hf_smb2_share_caps_assymetric, + &hf_smb2_share_caps_asymmetric, &hf_smb2_share_caps_redirect_to_owner, NULL }; @@ -13554,9 +13554,9 @@ proto_register_smb2(void) NULL, SHARE_CAPS_CLUSTER, "The specified share is a cluster share", HFILL } }, - { &hf_smb2_share_caps_assymetric, - { "ASSYMETRIC", "smb2.share_caps.assymetric", FT_BOOLEAN, 32, - NULL, SHARE_CAPS_ASSYMETRIC, "The specified share allows dynamic changes in ownership of the share", HFILL } + { &hf_smb2_share_caps_asymmetric, + { "ASYMMETRIC", "smb2.share_caps.asymmetric", FT_BOOLEAN, 32, + NULL, SHARE_CAPS_ASYMMETRIC, "The specified share allows dynamic changes in ownership of the share", HFILL } }, { &hf_smb2_share_caps_redirect_to_owner, diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index afd2f026e0..781055096e 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -324,7 +324,7 @@ static int hf_sprt_payload_msg_init_all_fields; static int hf_sprt_payload_msg_init_necrxch; static int hf_sprt_payload_msg_init_ecrxch; static int hf_sprt_payload_msg_init_xid_prof_exch; -static int hf_sprt_payload_msg_init_assym_data_types; +static int hf_sprt_payload_msg_init_asymm_data_types; static int hf_sprt_payload_msg_init_opt_moip_types_i_raw_bit; static int hf_sprt_payload_msg_init_opt_moip_types_i_frame; static int hf_sprt_payload_msg_init_opt_moip_types_i_char_stat; @@ -894,7 +894,7 @@ dissect_sprt_data(tvbuff_t *tvb, proto_tree_add_item(field_subtree, hf_sprt_payload_msg_init_necrxch, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_subtree, hf_sprt_payload_msg_init_ecrxch, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_subtree, hf_sprt_payload_msg_init_xid_prof_exch, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(field_subtree, hf_sprt_payload_msg_init_assym_data_types, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(field_subtree, hf_sprt_payload_msg_init_asymm_data_types, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_subtree, hf_sprt_payload_msg_init_opt_moip_types_i_raw_bit, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_subtree, hf_sprt_payload_msg_init_opt_moip_types_i_frame, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(field_subtree, hf_sprt_payload_msg_init_opt_moip_types_i_char_stat, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -1776,10 +1776,10 @@ proto_register_sprt(void) } }, { - &hf_sprt_payload_msg_init_assym_data_types, + &hf_sprt_payload_msg_init_asymm_data_types, { "Asymmetrical data types", - "sprt.payload.msg_init.assym_data_types", + "sprt.payload.msg_init.asymm_data_types", FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt index faa1f8e563..daa38affbc 100644 --- a/tools/wireshark_words.txt +++ b/tools/wireshark_words.txt @@ -17,7 +17,6 @@ accelerometer acceptor accessor accessors -accomodate accuracies acked acknack @@ -101,7 +100,6 @@ assembler assignee assignor assoc -assymetric async asynchronous asynchronously diff --git a/wiretap/blf.c b/wiretap/blf.c index cd458e0090..e1cc039d6c 100644 --- a/wiretap/blf.c +++ b/wiretap/blf.c @@ -2409,7 +2409,7 @@ guint16 blf_get_xml_channel_number(const char* start, const char* end) { } len = (gsize)(end - start); - text = g_try_malloc(len + 1); /* Accomodate '\0' */ + text = g_try_malloc(len + 1); /* Accommodate '\0' */ if (text == NULL) { ws_debug("cannot allocate memory"); return UINT16_MAX; @@ -2434,7 +2434,7 @@ char* blf_get_xml_channel_name(const char* start, const char* end) { } len = (gsize)(end - start); - text = g_try_malloc(len + 1); /* Accomodate '\0' */ + text = g_try_malloc(len + 1); /* Accommodate '\0' */ if (text == NULL) { ws_debug("cannot allocate memory"); return NULL; @@ -2460,7 +2460,7 @@ gboolean blf_parse_xml_port(const char* start, const char* end, char** name, gui } len = (gsize)(end - start); - text = g_try_malloc(len + 1); /* Accomodate '\0' */ + text = g_try_malloc(len + 1); /* Accommodate '\0' */ if (text == NULL) { ws_debug("cannot allocate memory"); return FALSE;