Eliminate trailing whitespace in trval output

Modify the trval output slightly so that the reference trval output files don't containing trailing whitespace, to make them friendlier to our git hooks. (The pkinit and ldap trval reference files now contain a leading blank line, which isn't very elegant, but avoiding that requires too much Makefile.in complexity.) Also correct a typo.
krb5 · Jun 22, 2012 · cff6ea9 · cff6ea9
1 parent 502a0cc
commit cff6ea9
Show file tree

Hide file tree

Showing 5 changed files with 1,259 additions and 1,254 deletions.
diff --git a/src/tests/asn.1/krb5_encode_test.c b/src/tests/asn.1/krb5_encode_test.c
@@ -37,6 +37,7 @@ extern int current_appl_type;
 krb5_context test_context;
 int error_count = 0;
 int do_trval = 0;
+int first_trval = 1;
 int trval2();
 
 static void
@@ -46,9 +47,13 @@ encoder_print_results(krb5_data *code, char *typestring, char *description)
     int r, rlen;
 
     if (do_trval) {
+        if (first_trval)
+            first_trval = 0;
+        else
+            printf("\n");
         printf("encode_krb5_%s%s:\n", typestring, description);
         r = trval2(stdout, code->data, code->length, 0, &rlen);
-        printf("\n\n");
+        printf("\n");
         if (rlen < 0 || (unsigned int) rlen != code->length) {
             printf("Error: length mismatch: was %d, parsed %d\n",
                    code->length, rlen);

diff --git a/src/tests/asn.1/ldap_trval.out b/src/tests/asn.1/ldap_trval.out
@@ -1,30 +1,30 @@
-encode_krb5_ldap_seqof_key_data:
 
-[Sequence/Sequence Of] 
-.  [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"
-.  .  .  [1] [Sequence/Sequence Of] 
-.  .  .  .  [0] [Integer] 2
-.  .  .  .  [1] [Octet String] "key0"
-.  .  [Sequence/Sequence Of] 
-.  .  .  [0] [Sequence/Sequence Of] 
-.  .  .  .  [0] [Integer] 1
-.  .  .  .  [1] [Octet String] "salt1"
-.  .  .  [1] [Sequence/Sequence Of] 
-.  .  .  .  [0] [Integer] 2
-.  .  .  .  [1] [Octet String] "key1"
-.  .  [Sequence/Sequence Of] 
-.  .  .  [0] [Sequence/Sequence Of] 
-.  .  .  .  [0] [Integer] 2
-.  .  .  .  [1] [Octet String] "salt2"
-.  .  .  [1] [Sequence/Sequence Of] 
-.  .  .  .  [0] [Integer] 2
-.  .  .  .  [1] [Octet String] "key2"
+encode_krb5_ldap_seqof_key_data:
 
+[Sequence/Sequence Of]
+.  [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"
+.  .  .  [1] [Sequence/Sequence Of]
+.  .  .  .  [0] [Integer]2
+.  .  .  .  [1] [Octet String]"key0"
+.  .  [Sequence/Sequence Of]
+.  .  .  [0] [Sequence/Sequence Of]
+.  .  .  .  [0] [Integer]1
+.  .  .  .  [1] [Octet String]"salt1"
+.  .  .  [1] [Sequence/Sequence Of]
+.  .  .  .  [0] [Integer]2
+.  .  .  .  [1] [Octet String]"key1"
+.  .  [Sequence/Sequence Of]
+.  .  .  [0] [Sequence/Sequence Of]
+.  .  .  .  [0] [Integer]2
+.  .  .  .  [1] [Octet String]"salt2"
+.  .  .  [1] [Sequence/Sequence Of]
+.  .  .  .  [0] [Integer]2
+.  .  .  .  [1] [Octet String]"key2"
diff --git a/src/tests/asn.1/pkinit_trval.out b/src/tests/asn.1/pkinit_trval.out
@@ -1,149 +1,149 @@
+
 encode_krb5_pa_pk_as_req:
 
-[Sequence/Sequence Of] 
-.  [0] <8>
+[Sequence/Sequence Of]
+.  [0]<8>
       6b 72 62 35 64 61 74 61                             krb5data
-.  [1] [Sequence/Sequence Of] 
-.  .  [Sequence/Sequence Of] 
-.  .  .  [0] <8>
+.  [1] [Sequence/Sequence Of]
+.  .  [Sequence/Sequence Of]
+.  .  .  [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>
+[Sequence/Sequence Of]
+.  [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>
+[CONT 0]
+.  [Sequence/Sequence Of]
+.  .  [0]<8>
          6b 72 62 35 64 61 74 61                          krb5data
-.  .  [1] [Octet String] "krb5data"
-.  .  [2] [Sequence/Sequence Of] 
-.  .  .  [0] [Object Identifier] <8>
+.  .  [1] [Octet String]"krb5data"
+.  .  [2] [Sequence/Sequence Of]
+.  .  .  [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"
-.  [1] [Sequence/Sequence Of] 
-.  .  [Sequence/Sequence Of] 
-.  .  .  [Object Identifier] <9>
+[Sequence/Sequence Of]
+.  [0] [Sequence/Sequence Of]
+.  .  [0] [Integer]123456
+.  .  [1] [Generalized Time]"19940610060317Z"
+.  .  [2] [Integer]42
+.  .  [3] [Octet String]"1234"
+.  [1] [Sequence/Sequence Of]
+.  .  [Sequence/Sequence Of]
+.  .  .  [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>
+.  [2] [Sequence/Sequence Of]
+.  .  [Sequence/Sequence Of]
+.  .  .  [Object Identifier]<9>
             2a 86 48 86 f7 12 01 02 02                       *.H......
-.  .  .  [Octet String] "params"
-.  .  [Sequence/Sequence Of] 
-.  .  .  [Object Identifier] <9>
+.  .  .  [Octet String]"params"
+.  .  [Sequence/Sequence Of]
+.  .  .  [Object Identifier]<9>
             2a 86 48 86 f7 12 01 02 02                       *.H......
-.  [3] [Octet String] "krb5data"
-.  [4] [Sequence/Sequence Of] 
-.  .  [Sequence/Sequence Of] 
-.  .  .  [0] [Object Identifier] <8>
+.  [3] [Octet String]"krb5data"
+.  [4] [Sequence/Sequence Of]
+.  .  [Sequence/Sequence Of]
+.  .  .  [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
-.  .  .  [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
-.  [1] [Sequence/Sequence Of] 
-.  .  [Sequence/Sequence Of] 
-.  .  .  [Object Identifier] <9>
+[Sequence/Sequence Of]
+.  [0] [Sequence/Sequence Of]
+.  .  [0] [Sequence/Sequence Of]
+.  .  .  [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
+.  [1] [Sequence/Sequence Of]
+.  .  [Sequence/Sequence Of]
+.  .  .  [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>
+[Sequence/Sequence Of]
+.  [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"
-.  [1] [Sequence/Sequence Of] 
-.  .  [0] [Integer] 1
-.  .  [1] [Octet String] "1234"
+[Sequence/Sequence Of]
+.  [0] [Sequence/Sequence Of]
+.  .  [0] [Integer]1
+.  .  [1] [Octet String]"12345678"
+.  [1] [Sequence/Sequence Of]
+.  .  [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
+[Sequence/Sequence Of]
+.  [0] [Sequence/Sequence Of]
+.  .  [0] [Integer]1
+.  .  [1] [Octet String]"12345678"
+.  [1] [Integer]42
 
 encode_krb5_sp80056a_other_info:
 
-[Sequence/Sequence Of] 
-.  [Sequence/Sequence Of] 
-.  .  [Object Identifier] <9>
+[Sequence/Sequence Of]
+.  [Sequence/Sequence Of]
+.  .  [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"
-
+[Sequence/Sequence Of]
+.  [0] [Integer]1
+.  [1] [Octet String]"krb5data"
+.  [2] [Octet String]"krb5data"
diff --git a/src/tests/asn.1/trval.c b/src/tests/asn.1/trval.c
@@ -225,6 +225,7 @@ int trval2(fp, enc, len, lev, rlen)
         (eid & ID_FORM) == FORM_CONS && lev > 0) {
         rlen_ext += 2 + xlen;
         enc += 2 + xlen;
+        fprintf(fp, " ");
         goto context_restart;
     }
 
@@ -477,7 +478,7 @@ struct typestring_table univ_types[] = {
 #ifdef KRB5
 struct typestring_table krb5_types[] = {
     { 1, -1, "Krb5 Ticket"},
-    { 2, -1, "Krb5 Autenticator"},
+    { 2, -1, "Krb5 Authenticator"},
     { 3, -1, "Krb5 Encrypted ticket part"},
     { 10, -1, "Krb5 AS-REQ packet"},
     { 11, -1, "Krb5 AS-REP packet"},
@@ -760,7 +761,7 @@ void print_tag_type(fp, eid, lev)
             fprintf(fp, "UNIV %d???", eid & ID_TAG);
     }
 
-    fprintf(fp, "] ");
+    fprintf(fp, "]");
 
 }