From d5679ed0e5ef5719497d5cd1921de4c4c4581b75 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Fri, 16 May 2003 00:24:37 +0000 Subject: [PATCH] Test base64 and hex encoding. Organization: Straylight/Edgeware From: mdw --- Makefile.am | 58 ++++++++++++++++++++++++++++++++++++++--------------- base64.c | 7 +++++-- base64.in | 24 ++++++++++++++++++++++ base64.ref | 24 ++++++++++++++++++++++ hex.c | 7 +++++-- hex.in | 13 ++++++++++++ hex.ref | 20 ++++++++++++++++++ 7 files changed, 133 insertions(+), 20 deletions(-) create mode 100644 base64.in create mode 100644 base64.ref create mode 100644 hex.in create mode 100644 hex.ref diff --git a/Makefile.am b/Makefile.am index d1ff5ad..d6c173f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## -*-Makefile-*- ## -## $Id: Makefile.am,v 1.34 2003/04/23 12:51:03 mdw Exp $ +## $Id: Makefile.am,v 1.35 2003/05/16 00:22:57 mdw Exp $ ## ## Building the distribution ## @@ -29,6 +29,9 @@ ##----- Revision history ---------------------------------------------------- ## ## $Log: Makefile.am,v $ +## Revision 1.35 2003/05/16 00:22:57 mdw +## Test base64 and hex encoding. +## ## Revision 1.34 2003/04/23 12:51:03 mdw ## New manpage installer. ## @@ -166,7 +169,7 @@ crc_mktab_SOURCES = crc-mktab.c mdwopt.c quis.c pquis.c report.c str.c noinst_PROGRAMS = da.t sym.t assoc.t bits.t check: \ - da.test sym.test assoc.test bits.test + da.test sym.test assoc.test bits.test base64.test hex.test da_t_SOURCES = da-test.c da_t_LDADD = libmLib.la @@ -176,8 +179,8 @@ da.in: $(srcdir)/da-gtest da.ref: da.in $(srcdir)/da-ref perl $(srcdir)/da-ref da.ref da.test: da.t da.in da.ref - ./da.t da.test - cmp da.test da.ref || { rm da.test; false; } + ./da.t da.out + cmp da.out da.ref @echo "darray tested OK." sym_t_SOURCES = sym-test.c @@ -188,16 +191,16 @@ sym.in: $(srcdir)/sym-gtest sym.ref: sym.in $(srcdir)/sym-ref perl $(srcdir)/sym-ref sym.ref sym.test: sym.t sym.in sym.ref - ./sym.t sym.test - cmp sym.test sym.ref || { rm sym.test; false; } + ./sym.t sym.out + cmp sym.out sym.ref @echo "sym tested OK." assoc_t_SOURCES = assoc-test.c assoc_t_LDADD = libmLib.la assoc_t_LDFLAGS = -static assoc.test: assoc.t sym.in sym.ref - ./assoc.t assoc.test - cmp assoc.test sym.ref || { rm assoc.test; false; } + ./assoc.t assoc.out + cmp assoc.out sym.ref @echo "assoc tested OK." bits_t_SOURCES = bits.c @@ -205,19 +208,42 @@ bits_t_LDADD = libmLib.la bits_t_LDFLAGS = -static bits.o: bits.c $(COMPILE) -c -DSRCDIR="\"$(srcdir)\"" $(srcdir)/bits.c -o bits.o -bits-test: bits.t - ./bits.t -f $(srcdir)/bits.test +bits.test: bits.t + ./bits.t -f $(srcdir)/bits.in + +base64.to: base64.c + $(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/base64.c -o base64.to +base64.t: base64.to base64.o libmLib.la + $(CC) $(CFLAGS) $(LDFLAGS) base64.to .libs/libmLib.a $(LIBS) -o base64.t +base64.test: base64.t base64.in base64.ref + ./base64.t <$(srcdir)/base64.in >base64.out + cmp base64.out $(srcdir)/base64.ref + ./base64.t -d <$(srcdir)/base64.ref >base64.out + cmp base64.out $(srcdir)/base64.in + @echo "base64 tested OK." + +hex.to: hex.c + $(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/hex.c -o hex.to +hex.t: hex.to hex.o libmLib.la + $(CC) $(CFLAGS) $(LDFLAGS) hex.to .libs/libmLib.a $(LIBS) -o hex.t +hex.test: hex.t hex.in hex.ref + ./hex.t <$(srcdir)/hex.in >hex.out + cmp hex.out $(srcdir)/hex.ref + ./hex.t -d <$(srcdir)/hex.ref >hex.out + cmp hex.out $(srcdir)/hex.in + @echo "hex tested OK." TEST_CLEAN = \ - da.in da.ref da.test \ - sym.in sym.ref sym.test \ - base64.test hex.test + *.t \ + da.in da.ref da.out \ + sym.in sym.ref sym.out \ + base64.out hex.out TEST_DIST = \ da-gtest da-ref \ sym-gtest sym-ref \ - bits.test bits-testgen.c \ - base64.in hex.in + bits.in bits-testgen.c \ + base64.in base64.ref hex.in hex.ref ## --- Background resolver --- ## @@ -242,6 +268,6 @@ uninstall-man: CLEANFILES = $(TEST_CLEAN) crc32-tab.c DISTCLEANFILES = libtool -EXTRA_DIST = $(TEST_DIST) +EXTRA_DIST = $(TEST_DIST) maninst ##----- That's all, folks --------------------------------------------------- diff --git a/base64.c b/base64.c index 2cefb41..0af744c 100644 --- a/base64.c +++ b/base64.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: base64.c,v 1.5 2002/01/13 13:26:16 mdw Exp $ + * $Id: base64.c,v 1.6 2003/05/16 00:22:58 mdw Exp $ * * Base64 encoding and decoding. * @@ -30,6 +30,9 @@ /*----- Revision history --------------------------------------------------* * * $Log: base64.c,v $ + * Revision 1.6 2003/05/16 00:22:58 mdw + * Test base64 and hex encoding. + * * Revision 1.5 2002/01/13 13:26:16 mdw * Change names for internal tables. * @@ -272,7 +275,7 @@ int main(int argc, char *argv[]) unsigned char buf[BUFSIZ]; dstr d = DSTR_INIT; base64_ctx ctx; - void (*proc)(base64_ctx *, const unsigned char *, size_t, dstr *); + void (*proc)(base64_ctx *, const void *, size_t, dstr *); size_t sz; base64_init(&ctx); diff --git a/base64.in b/base64.in new file mode 100644 index 0000000..359f0e6 --- /dev/null +++ b/base64.in @@ -0,0 +1,24 @@ +Buffy: They say how he's gonna kill me? Do you think it'll hurt? + Don't touch me! Were you even gonna tell me? +Giles: I was hoping that I wouldn't have to. That there was... some + way around it. I... +Buffy: I've got a way around it. I quit! +Angel: It's not that simple. +Buffy: I'm making it that simple! I quit! I resign, I-I'm fired, + you can find someone else to stop the Master from taking over! +Giles: I'm not sure that anyone else can. All the... the signs + indicate... +Buffy: The signs? READ ME THE SIGNS! TELL ME MY FORTUNE! YOU'RE SO + USEFUL SITTING HERE WITH ALL YOUR BOOKS! YOU'RE REALLY A LOTTA + HELP! +Giles: No, I don't suppose I am. +Angel: I know this is hard. +Buffy: What do you know about this? You're never gonna die! +Angel: You think I want anything to happen to you? Do you think I + could stand it? We just gotta figure out a way... +Buffy: I already did. I quit, remember? Pay attention! +Giles: Buffy, if the Master rises... +Buffy: I don't care! I don't care. Giles, I'm sixteen years old. I + don't wanna die. + -- Prophecy Girl + (Buffy the Vampire Slayer, season 1 episode 12) diff --git a/base64.ref b/base64.ref new file mode 100644 index 0000000..aa5b87a --- /dev/null +++ b/base64.ref @@ -0,0 +1,24 @@ + QnVmZnk6IFRoZXkgc2F5IGhvdyBoZSdzIGdvbm5hIGtpbGwgbWU/IERvIHlvdSB0 + aGluayBpdCdsbCBodXJ0PwogIERvbid0IHRvdWNoIG1lISBXZXJlIHlvdSBldmVu + IGdvbm5hIHRlbGwgbWU/CkdpbGVzOiBJIHdhcyBob3BpbmcgdGhhdCBJIHdvdWxk + bid0IGhhdmUgdG8uIFRoYXQgdGhlcmUgd2FzLi4uIHNvbWUKICB3YXkgYXJvdW5k + IGl0LiBJLi4uCkJ1ZmZ5OiBJJ3ZlIGdvdCBhIHdheSBhcm91bmQgaXQuIEkgcXVp + dCEKQW5nZWw6IEl0J3Mgbm90IHRoYXQgc2ltcGxlLgpCdWZmeTogSSdtIG1ha2lu + ZyBpdCB0aGF0IHNpbXBsZSEgSSBxdWl0ISBJIHJlc2lnbiwgSS1JJ20gZmlyZWQs + CiAgeW91IGNhbiBmaW5kIHNvbWVvbmUgZWxzZSB0byBzdG9wIHRoZSBNYXN0ZXIg + ZnJvbSB0YWtpbmcgb3ZlciEKR2lsZXM6IEknbSBub3Qgc3VyZSB0aGF0IGFueW9u + ZSBlbHNlIGNhbi4gQWxsIHRoZS4uLiB0aGUgc2lnbnMKICBpbmRpY2F0ZS4uLgpC + dWZmeTogVGhlIHNpZ25zPyBSRUFEIE1FIFRIRSBTSUdOUyEgVEVMTCBNRSBNWSBG + T1JUVU5FISBZT1UnUkUgU08KICBVU0VGVUwgU0lUVElORyBIRVJFIFdJVEggQUxM + IFlPVVIgQk9PS1MhIFlPVSdSRSBSRUFMTFkgQSBMT1RUQQogIEhFTFAhCkdpbGVz + OiBObywgSSBkb24ndCBzdXBwb3NlIEkgYW0uCkFuZ2VsOiBJIGtub3cgdGhpcyBp + cyBoYXJkLgpCdWZmeTogV2hhdCBkbyB5b3Uga25vdyBhYm91dCB0aGlzPyBZb3Un + cmUgbmV2ZXIgZ29ubmEgZGllIQpBbmdlbDogWW91IHRoaW5rIEkgd2FudCBhbnl0 + aGluZyB0byBoYXBwZW4gdG8geW91PyBEbyB5b3UgdGhpbmsgSQogIGNvdWxkIHN0 + YW5kIGl0PyBXZSBqdXN0IGdvdHRhIGZpZ3VyZSBvdXQgYSB3YXkuLi4KQnVmZnk6 + IEkgYWxyZWFkeSBkaWQuIEkgcXVpdCwgcmVtZW1iZXI/IFBheSBhdHRlbnRpb24h + CkdpbGVzOiBCdWZmeSwgaWYgdGhlIE1hc3RlciByaXNlcy4uLgpCdWZmeTogSSBk + b24ndCBjYXJlISBJIGRvbid0IGNhcmUuIEdpbGVzLCBJJ20gc2l4dGVlbiB5ZWFy + cyBvbGQuIEkKICBkb24ndCB3YW5uYSBkaWUuCgktLSBQcm9waGVjeSBHaXJsCgkg + ICAoQnVmZnkgdGhlIFZhbXBpcmUgU2xheWVyLCBzZWFzb24gMSBlcGlzb2RlIDEy + KQo= diff --git a/hex.c b/hex.c index 93bc3de..45b4f33 100644 --- a/hex.c +++ b/hex.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: hex.c,v 1.1 2002/01/13 13:26:30 mdw Exp $ + * $Id: hex.c,v 1.2 2003/05/16 00:22:58 mdw Exp $ * * Hexadecimal encoding and decoding. * @@ -30,6 +30,9 @@ /*----- Revision history --------------------------------------------------* * * $Log: hex.c,v $ + * Revision 1.2 2003/05/16 00:22:58 mdw + * Test base64 and hex encoding. + * * Revision 1.1 2002/01/13 13:26:30 mdw * New hex encoding stuff. * @@ -175,7 +178,7 @@ int main(int argc, char *argv[]) unsigned char buf[BUFSIZ]; dstr d = DSTR_INIT; hex_ctx ctx; - void (*proc)(hex_ctx *, const unsigned char *, size_t, dstr *); + void (*proc)(hex_ctx *, const void *, size_t, dstr *); size_t sz; hex_init(&ctx); diff --git a/hex.in b/hex.in new file mode 100644 index 0000000..4f7322f --- /dev/null +++ b/hex.in @@ -0,0 +1,13 @@ +Angel: I saw you before you became the Slayer. +Buffy: What? +Angel: I watched you, and I saw you called. It was a bright + afternoon out in front of your school. You walked down the steps... + and...and I loved you. +Buffy: Why? +Angel: 'Cause I could see your heart. You held it before you for + everyone to see. And I worried that it would be bruised or torn. + And more than anything in my life I wanted to keep it safe... to + warm it with my own. +Buffy: That's beautiful. Or taken literally, incredibly gross. +Angel: I was just thinking that, too. + -- Helpless (Buffy the Vampire Slayer, season 3 episode 12) diff --git a/hex.ref b/hex.ref new file mode 100644 index 0000000..0176495 --- /dev/null +++ b/hex.ref @@ -0,0 +1,20 @@ + 416e67656c3a20492073617720796f75206265666f726520796f752062656361 + 6d652074686520536c617965722e0a42756666793a20576861743f0a416e6765 + 6c3a2049207761746368656420796f752c20616e6420492073617720796f7520 + 63616c6c65642e204974207761732061206272696768740a202061667465726e + 6f6f6e206f757420696e2066726f6e74206f6620796f7572207363686f6f6c2e + 20596f752077616c6b656420646f776e207468652073746570732e2e2e0a2020 + 616e642e2e2e616e642049206c6f76656420796f752e0a42756666793a205768 + 793f0a416e67656c3a20274361757365204920636f756c642073656520796f75 + 722068656172742e20596f752068656c64206974206265666f726520796f7520 + 666f720a202065766572796f6e6520746f207365652e20416e64204920776f72 + 72696564207468617420697420776f756c642062652062727569736564206f72 + 20746f726e2e0a2020416e64206d6f7265207468616e20616e797468696e6720 + 696e206d79206c69666520492077616e74656420746f206b6565702069742073 + 6166652e2e2e20746f0a20207761726d2069742077697468206d79206f776e2e + 0a42756666793a205468617427732062656175746966756c2e204f722074616b + 656e206c69746572616c6c792c20696e6372656469626c792067726f73732e0a + 416e67656c3a204920776173206a757374207468696e6b696e6720746861742c + 20746f6f2e0a092d2d2048656c706c6573732028427566667920746865205661 + 6d7069726520536c617965722c20736561736f6e203320657069736f64652031 + 32290a -- [mdw]