apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr-util/test testmd5.c Makefile.in
Date Wed, 17 Jul 2002 02:56:37 GMT
wrowe       2002/07/16 19:56:37

  Modified:    test     Makefile.in
               test     Makefile.in
  Added:       test     testmd5.c
  Removed:     test     testmd5.c
  Log:
    Forgot to haul the test on across libraries
  
  Revision  Changes    Path
  1.86      +0 -4      apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/test/Makefile.in,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- Makefile.in	5 Jul 2002 08:49:55 -0000	1.85
  +++ Makefile.in	17 Jul 2002 02:56:37 -0000	1.86
  @@ -32,7 +32,6 @@
   	testuuid@EXEEXT@ \
   	testsockopt@EXEEXT@ \
   	testipsub@EXEEXT@ \
  -	testmd5@EXEEXT@ \
   	testpoll@EXEEXT@ \
   	testhash@EXEEXT@ \
   	occhild@EXEEXT@ \
  @@ -152,9 +151,6 @@
   
   testipsub@EXEEXT@: testipsub.lo $(LOCAL_LIBS)
   	$(LINK) testipsub.lo $(LOCAL_LIBS) $(ALL_LIBS)
  -
  -testmd5@EXEEXT@: testmd5.lo $(LOCAL_LIBS)
  -	$(LINK) testmd5.lo $(LOCAL_LIBS) $(ALL_LIBS)
   
   testpoll@EXEEXT@: testpoll.lo $(LOCAL_LIBS)
   	$(LINK) testpoll.lo $(LOCAL_LIBS) $(ALL_LIBS)
  
  
  
  1.28      +6 -1      apr-util/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/test/Makefile.in,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Makefile.in	14 May 2002 08:37:17 -0000	1.27
  +++ Makefile.in	17 Jul 2002 02:56:37 -0000	1.28
  @@ -2,7 +2,7 @@
   
   INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
   
  -PROGRAMS = testdbm testdate testmd4 testxml testrmm teststrmatch
  +PROGRAMS = testdbm testdate testmd4 testmd5 testxml testrmm teststrmatch
   TARGETS = $(PROGRAMS)
   
   # bring in rules.mk for standard functionality
  @@ -30,6 +30,11 @@
   testmd4_LDADD =  ../libaprutil.la
   testmd4: $(testmd4_OBJECTS) $(testmd4_LDADD)
   	$(LINK) $(testmd4_OBJECTS) $(testmd4_LDADD) $(PROGRAM_DEPENDENCIES)
  +
  +testmd5_OBJECTS = testmd5.lo
  +testmd5_LDADD =  ../libaprutil.la
  +testmd5: $(testmd5_OBJECTS) $(testmd5_LDADD)
  +	$(LINK) $(testmd5_OBJECTS) $(testmd5_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testrmm_OBJECTS = testrmm.lo
   testrmm_LDADD =  ../libaprutil.la
  
  
  
  1.1                  apr-util/test/testmd5.c
  
  Index: testmd5.c
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #include <assert.h>
  #include <stdlib.h>
  #include <stdio.h>
  
  #include "apr_md5.h"
  #include "apr_xlate.h"
  #include "apr_general.h"
  #include "test_apr.h"
  
  int cur; 
  
  struct testcase {
      const char *s;
      const char *digest;
  };
  
  struct testcase testcases[] =
  {
      {"Jeff was here!",
       "\xa5\x25\x8a\x89\x11\xb2\x9d\x1f\x81\x75\x96\x3b\x60\x94\x49\xc0"},
      {"01234567890aBcDeFASDFGHJKLPOIUYTR"
       "POIUYTREWQZXCVBN  LLLLLLLLLLLLLLL",
       "\xd4\x1a\x06\x2c\xc5\xfd\x6f\x24\x67\x68\x56\x7c\x40\x8a\xd5\x69"},
      {"111111118888888888888888*******%%%%%%%%%%#####"
       "142134u8097289720432098409289nkjlfkjlmn,m..   ",
       "\xb6\xea\x5b\xe8\xca\x45\x8a\x33\xf0\xf1\x84\x6f\xf9\x65\xa8\xe1"},
      {"01234567890aBcDeFASDFGHJKLPOIUYTR"
       "POIUYTREWQZXCVBN  LLLLLLLLLLLLLLL"
       "01234567890aBcDeFASDFGHJKLPOIUYTR"
       "POIUYTREWQZXCVBN  LLLLLLLLLLLLLLL"
       "1",
       "\xd1\xa1\xc0\x97\x8a\x60\xbb\xfb\x2a\x25\x46\x9d\xa5\xae\xd0\xb0"}
  };
  
  static void try(const void *buf, apr_size_t bufLen, apr_xlate_t *xlate,
                  const void *digest)
  {
      int i;
      apr_md5_ctx_t context;
      unsigned char hash[MD5_DIGESTSIZE];
      
      printf("Trying translation %d\n", cur + 1);
  
      STD_TEST_NEQ("    apr_md5_init", apr_md5_init(&context))
  
      if (xlate) {
  #if APR_HAS_XLATE
          STD_TEST_NEQ("    apr_md5_set_xlate", 
                       apr_md5_set_xlate(&context, xlate))
  #else
          printf("    Didn't expect a translation handle! Not fatal.\n");
  #endif
      }
      
      STD_TEST_NEQ("    apr_md5_update", apr_md5_update(&context, buf, bufLen))
      STD_TEST_NEQ("    apr_md5_final", apr_md5_final(hash, &context))
  
      printf("     (MD5 hash : ");
      for (i = 0; i < MD5_DIGESTSIZE; i++) {
          printf("%02x",hash[i]);
      }
      
      printf(")\n");
  
      printf("%-60s", "    Checking hash against expected");
      if (memcmp(hash, digest, MD5_DIGESTSIZE)) {
          /* This is a fatal error...report on stderr */
          fprintf(stderr, "The digest is not as expected!\n");
  #if 'A' != 0x41
          fprintf(stderr,
                  "Maybe you didn't tell me what character sets "
                  "to translate between?\n"
                  "The expected digest is based on the string "
                  "being in ASCII.\n");
  #endif
      }
      printf("OK\n");
  }
  
  int main(int argc, char **argv)
  {
      apr_status_t rv;
      apr_xlate_t *xlate = NULL;
      apr_pool_t *pool;
      const char *src = NULL, *dst = NULL;
  
      switch(argc) {
      case 1:
          break;
      case 3:
          src = argv[1];
          dst = argv[2];
          break;
      default:
          fprintf(stderr,
                  "Usage: %s [src-charset dst-charset]\n",
                  argv[0]);
          exit(1);
      }
  
      rv = apr_initialize();
      assert(!rv);
      atexit(apr_terminate);
  
      printf("APR MD5 Test\n============\n\n");
      STD_TEST_NEQ("Creating pool", apr_pool_create(&pool, NULL))
  
      if (src) {
  #if APR_HAS_XLATE
          STD_TEST_NEQ("Opening xlate functions", 
                       apr_xlate_open(&xlate, dst, src, pool))
  #else
          /* This isn't a fatal error, so just report it... */
          printf("APR doesn't implement translation for this "
                 "configuration.\n");
  #endif
      }
  
      for (cur = 0; cur < sizeof(testcases) / sizeof(testcases[0]); cur++) {
          try(testcases[cur].s, strlen(testcases[cur].s), xlate,
              testcases[cur].digest);
      }
  
      printf("\nMD5 Test passed.\n");    
      return 0;
  }
  
  
  

Mime
View raw message