Skip to content

Commit

Permalink
Restore some spaces in trval
Browse files Browse the repository at this point in the history 
This is a cosmetic change to reintroduce some space characters that
cff6ea9 removed, e.g. between the tag
and the length or short value.
  • Loading branch information
@tlyu
tlyu committed Jun 25, 2012
1 parent f6e245f commit 0f97634
Show file tree
Hide file tree
Showing 4 changed files with 790 additions and 790 deletions.
32 changes: 16 additions & 16 deletions src/tests/asn.1/ldap_trval.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
encode_krb5_ldap_seqof_key_data:

[Sequence/Sequence Of]
. [0] [Integer]1
. [1] [Integer]1
. [2] [Integer]42
. [3] [Integer]14
. [0] [Integer] 1
. [1] [Integer] 1
. [2] [Integer] 42
. [3] [Integer] 14
. [4] [Sequence/Sequence Of]
. . [Sequence/Sequence Of]
. . . [0] [Sequence/Sequence Of]
. . . . [0] [Integer]0
. . . . [1] [Octet String]"salt0"
. . . . [0] [Integer] 0
. . . . [1] [Octet String] "salt0"
. . . [1] [Sequence/Sequence Of]
. . . . [0] [Integer]2
. . . . [1] [Octet String]"key0"
. . . . [0] [Integer] 2
. . . . [1] [Octet String] "key0"
. . [Sequence/Sequence Of]
. . . [0] [Sequence/Sequence Of]
. . . . [0] [Integer]1
. . . . [1] [Octet String]"salt1"
. . . . [0] [Integer] 1
. . . . [1] [Octet String] "salt1"
. . . [1] [Sequence/Sequence Of]
. . . . [0] [Integer]2
. . . . [1] [Octet String]"key1"
. . . . [0] [Integer] 2
. . . . [1] [Octet String] "key1"
. . [Sequence/Sequence Of]
. . . [0] [Sequence/Sequence Of]
. . . . [0] [Integer]2
. . . . [1] [Octet String]"salt2"
. . . . [0] [Integer] 2
. . . . [1] [Octet String] "salt2"
. . . [1] [Sequence/Sequence Of]
. . . . [0] [Integer]2
. . . . [1] [Octet String]"key2"
. . . . [0] [Integer] 2
. . . . [1] [Octet String] "key2"
104 changes: 52 additions & 52 deletions src/tests/asn.1/pkinit_trval.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,148 +2,148 @@
encode_krb5_pa_pk_as_req:

[Sequence/Sequence Of]
. [0]<8>
. [0] <8>
6b 72 62 35 64 61 74 61 krb5data
. [1] [Sequence/Sequence Of]
. . [Sequence/Sequence Of]
. . . [0]<8>
. . . [0] <8>
6b 72 62 35 64 61 74 61 krb5data
. . . [1]<8>
. . . [1] <8>
6b 72 62 35 64 61 74 61 krb5data
. . . [2]<8>
. . . [2] <8>
6b 72 62 35 64 61 74 61 krb5data
. [2]<8>
. [2] <8>
6b 72 62 35 64 61 74 61 krb5data

encode_krb5_pa_pk_as_req_draft9:

[Sequence/Sequence Of]
. [0]<8>
. [0] <8>
6b 72 62 35 64 61 74 61 krb5data
. [2]<8>
. [2] <8>
6b 72 62 35 64 61 74 61 krb5data

encode_krb5_pa_pk_as_rep(dhInfo):

[CONT 0]
. [Sequence/Sequence Of]
. . [0]<8>
. . [0] <8>
6b 72 62 35 64 61 74 61 krb5data
. . [1] [Octet String]"krb5data"
. . [1] [Octet String] "krb5data"
. . [2] [Sequence/Sequence Of]
. . . [0] [Object Identifier]<8>
. . . [0] [Object Identifier] <8>
6b 72 62 35 64 61 74 61 krb5data

encode_krb5_pa_pk_as_rep(encKeyPack):

[CONT 1]<8>
[CONT 1] <8>
6b 72 62 35 64 61 74 61 krb5data

encode_krb5_pa_pk_as_rep_draft9(dhSignedData):

[CONT 0]<8>
[CONT 0] <8>
6b 72 62 35 64 61 74 61 krb5data

encode_krb5_pa_pk_as_rep_draft9(encKeyPack):

[CONT 1]<8>
[CONT 1] <8>
6b 72 62 35 64 61 74 61 krb5data

encode_krb5_auth_pack:

[Sequence/Sequence Of]
. [0] [Sequence/Sequence Of]
. . [0] [Integer]123456
. . [1] [Generalized Time]"19940610060317Z"
. . [2] [Integer]42
. . [3] [Octet String]"1234"
. . [0] [Integer] 123456
. . [1] [Generalized Time] "19940610060317Z"
. . [2] [Integer] 42
. . [3] [Octet String] "1234"
. [1] [Sequence/Sequence Of]
. . [Sequence/Sequence Of]
. . . [Object Identifier]<9>
. . . [Object Identifier] <9>
2a 86 48 86 f7 12 01 02 02 *.H......
. . . [Octet String]"params"
. . [Bit String]<9>
. . . [Octet String] "params"
. . [Bit String] <9>
00 6b 72 62 35 64 61 74 61 .krb5data
. [2] [Sequence/Sequence Of]
. . [Sequence/Sequence Of]
. . . [Object Identifier]<9>
. . . [Object Identifier] <9>
2a 86 48 86 f7 12 01 02 02 *.H......
. . . [Octet String]"params"
. . . [Octet String] "params"
. . [Sequence/Sequence Of]
. . . [Object Identifier]<9>
. . . [Object Identifier] <9>
2a 86 48 86 f7 12 01 02 02 *.H......
. [3] [Octet String]"krb5data"
. [3] [Octet String] "krb5data"
. [4] [Sequence/Sequence Of]
. . [Sequence/Sequence Of]
. . . [0] [Object Identifier]<8>
. . . [0] [Object Identifier] <8>
6b 72 62 35 64 61 74 61 krb5data

encode_krb5_auth_pack_draft9:

[Sequence/Sequence Of]
. [0] [Sequence/Sequence Of]
. . [0] [Sequence/Sequence Of]
. . . [0] [Integer]1
. . . [0] [Integer] 1
. . . [1] [Sequence/Sequence Of]
. . . . [General string]"hftsai"
. . . . [General string]"extra"
. . [1] [General string]"ATHENA.MIT.EDU"
. . [2] [Integer]123456
. . [3] [Generalized Time]"19940610060317Z"
. . [4] [Integer]42
. . . . [General string] "hftsai"
. . . . [General string] "extra"
. . [1] [General string] "ATHENA.MIT.EDU"
. . [2] [Integer] 123456
. . [3] [Generalized Time] "19940610060317Z"
. . [4] [Integer] 42
. [1] [Sequence/Sequence Of]
. . [Sequence/Sequence Of]
. . . [Object Identifier]<9>
. . . [Object Identifier] <9>
2a 86 48 86 f7 12 01 02 02 *.H......
. . . [Octet String]"params"
. . [Bit String]<9>
. . . [Octet String] "params"
. . [Bit String] <9>
00 6b 72 62 35 64 61 74 61 .krb5data

encode_krb5_kdc_dh_key_info:

[Sequence/Sequence Of]
. [0] [Bit String]<9>
. [0] [Bit String] <9>
00 6b 72 62 35 64 61 74 61 .krb5data
. [1] [Integer]42
. [2] [Generalized Time]"19940610060317Z"
. [1] [Integer] 42
. [2] [Generalized Time] "19940610060317Z"

encode_krb5_reply_key_pack:

[Sequence/Sequence Of]
. [0] [Sequence/Sequence Of]
. . [0] [Integer]1
. . [1] [Octet String]"12345678"
. . [0] [Integer] 1
. . [1] [Octet String] "12345678"
. [1] [Sequence/Sequence Of]
. . [0] [Integer]1
. . [1] [Octet String]"1234"
. . [0] [Integer] 1
. . [1] [Octet String] "1234"

encode_krb5_reply_key_pack_draft9:

[Sequence/Sequence Of]
. [0] [Sequence/Sequence Of]
. . [0] [Integer]1
. . [1] [Octet String]"12345678"
. [1] [Integer]42
. . [0] [Integer] 1
. . [1] [Octet String] "12345678"
. [1] [Integer] 42

encode_krb5_sp80056a_other_info:

[Sequence/Sequence Of]
. [Sequence/Sequence Of]
. . [Object Identifier]<9>
. . [Object Identifier] <9>
2a 86 48 86 f7 12 01 02 02 *.H......
. [0] [Octet String]<48>
. [0] [Octet String] <48>
30 2e a0 10 1b 0e 41 54 48 45 4e 41 2e 4d 49 54 0.....ATHENA.MIT
2e 45 44 55 a1 1a 30 18 a0 03 02 01 01 a1 11 30 .EDU..0........0
0f 1b 06 68 66 74 73 61 69 1b 05 65 78 74 72 61 ...hftsai..extra
. [1] [Octet String]<48>
. [1] [Octet String] <48>
30 2e a0 10 1b 0e 41 54 48 45 4e 41 2e 4d 49 54 0.....ATHENA.MIT
2e 45 44 55 a1 1a 30 18 a0 03 02 01 01 a1 11 30 .EDU..0........0
0f 1b 06 68 66 74 73 61 69 1b 05 65 78 74 72 61 ...hftsai..extra
. [2] [Octet String]"krb5data"
. [2] [Octet String] "krb5data"

encode_krb5_pkinit_supp_pub_info:

[Sequence/Sequence Of]
. [0] [Integer]1
. [1] [Octet String]"krb5data"
. [2] [Octet String]"krb5data"
. [0] [Integer] 1
. [1] [Octet String] "krb5data"
. [2] [Octet String] "krb5data"
12 changes: 6 additions & 6 deletions src/tests/asn.1/trval.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@ int trval2(fp, enc, len, lev, rlen)
break;
case FORM_CONS:
if (print_constructed_length) {
fprintf(fp, "constr ");
fprintf(fp, "<%d>", elen);
fprintf(fp, " constr");
fprintf(fp, " <%d>", elen);
}
r = do_cons(fp, enc+2+xlen, elen, lev+1, &rlen2);
*rlen = 2 + xlen + rlen2 + rlen_ext;
Expand Down Expand Up @@ -287,7 +287,7 @@ int do_prim_bitstring(fp, tag, enc, len, lev)
num += enc[i];
}

fprintf(fp, "0x%lx", num);
fprintf(fp, " 0x%lx", num);
if (enc[0])
fprintf(fp, " (%d unused bits)", enc[0]);
return 1;
Expand Down Expand Up @@ -317,7 +317,7 @@ int do_prim_int(fp, tag, enc, len, lev)
num += enc[i];
}

fprintf(fp, "%ld", num);
fprintf(fp, " %ld", num);
return 1;
}

Expand All @@ -344,7 +344,7 @@ int do_prim_string(fp, tag, enc, len, lev)
for (i=0; i < len; i++)
if (!isprint(enc[i]))
return 0;
fprintf(fp, "\"%.*s\"", len, enc);
fprintf(fp, " \"%.*s\"", len, enc);
return 1;
}

Expand All @@ -368,7 +368,7 @@ int do_prim(fp, tag, enc, len, lev)
return OK;

if (print_primitive_length)
fprintf(fp, "<%d>", len);
fprintf(fp, " <%d>", len);

width = (80 - (lev * 3) - 8) / 4;

Expand Down

0 comments on commit 0f97634

Please sign in to comment.