Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/regress/lib The libdes tests have been converted to atf and ...



details:   https://anonhg.NetBSD.org/src/rev/0142764582e1
branches:  trunk
changeset: 757337:0142764582e1
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Wed Aug 25 16:47:43 2010 +0000

description:
The libdes tests have been converted to atf and now live in tests/lib/libdes.

diffstat:

 regress/lib/Makefile         |    6 +-
 regress/lib/libdes/Makefile  |   13 -
 regress/lib/libdes/destest.c |  905 -------------------------------------------
 3 files changed, 1 insertions(+), 923 deletions(-)

diffs (truncated from 944 to 300 lines):

diff -r 74da27dc4af3 -r 0142764582e1 regress/lib/Makefile
--- a/regress/lib/Makefile      Wed Aug 25 16:46:48 2010 +0000
+++ b/regress/lib/Makefile      Wed Aug 25 16:47:43 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.25 2010/07/17 19:29:35 jmmv Exp $
+#      $NetBSD: Makefile,v 1.26 2010/08/25 16:47:43 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -10,8 +10,4 @@
 #SUBDIR+= libssp
 .endif
 
-.if ${MKCRYPTO} != "no"
-SUBDIR+= libdes
-.endif
-
 .include <bsd.subdir.mk>
diff -r 74da27dc4af3 -r 0142764582e1 regress/lib/libdes/Makefile
--- a/regress/lib/libdes/Makefile       Wed Aug 25 16:46:48 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2003/08/04 04:20:26 itojun Exp $
-
-NOMAN=         # defined
-
-PROG=          destest
-DPADD+=                ${LIBDES}
-LDADD+=                -ldes
-
-regress:       ${PROG}
-       @echo "==> running ${PROG}"
-       @./${PROG}
-
-.include <bsd.prog.mk>
diff -r 74da27dc4af3 -r 0142764582e1 regress/lib/libdes/destest.c
--- a/regress/lib/libdes/destest.c      Wed Aug 25 16:46:48 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,905 +0,0 @@
-/* crypto/des/destest.c */
-/* Copyright (C) 1995-1998 Eric Young (eay%cryptsoft.com@localhost)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay%cryptsoft.com@localhost).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh%cryptsoft.com@localhost).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay%cryptsoft.com@localhost)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh%cryptsoft.com@localhost)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS 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 AUTHOR OR 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <des.h>
-
-#define crypt(c,s) (des_crypt((c),(s)))
-
-/* tisk tisk - the test keys don't all have odd parity :-( */
-/* test data */
-#define NUM_TESTS 34
-static unsigned char key_data[NUM_TESTS][8]={
-       {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-       {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-       {0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-       {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-       {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-       {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-       {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-       {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10},
-       {0x7C,0xA1,0x10,0x45,0x4A,0x1A,0x6E,0x57},
-       {0x01,0x31,0xD9,0x61,0x9D,0xC1,0x37,0x6E},
-       {0x07,0xA1,0x13,0x3E,0x4A,0x0B,0x26,0x86},
-       {0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E},
-       {0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6},
-       {0x01,0x13,0xB9,0x70,0xFD,0x34,0xF2,0xCE},
-       {0x01,0x70,0xF1,0x75,0x46,0x8F,0xB5,0xE6},
-       {0x43,0x29,0x7F,0xAD,0x38,0xE3,0x73,0xFE},
-       {0x07,0xA7,0x13,0x70,0x45,0xDA,0x2A,0x16},
-       {0x04,0x68,0x91,0x04,0xC2,0xFD,0x3B,0x2F},
-       {0x37,0xD0,0x6B,0xB5,0x16,0xCB,0x75,0x46},
-       {0x1F,0x08,0x26,0x0D,0x1A,0xC2,0x46,0x5E},
-       {0x58,0x40,0x23,0x64,0x1A,0xBA,0x61,0x76},
-       {0x02,0x58,0x16,0x16,0x46,0x29,0xB0,0x07},
-       {0x49,0x79,0x3E,0xBC,0x79,0xB3,0x25,0x8F},
-       {0x4F,0xB0,0x5E,0x15,0x15,0xAB,0x73,0xA7},
-       {0x49,0xE9,0x5D,0x6D,0x4C,0xA2,0x29,0xBF},
-       {0x01,0x83,0x10,0xDC,0x40,0x9B,0x26,0xD6},
-       {0x1C,0x58,0x7F,0x1C,0x13,0x92,0x4F,0xEF},
-       {0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
-       {0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E},
-       {0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
-       {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-       {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-       {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-       {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10}};
-
-static unsigned char plain_data[NUM_TESTS][8]={
-       {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-       {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-       {0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01},
-       {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-       {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-       {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-       {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-       {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-       {0x01,0xA1,0xD6,0xD0,0x39,0x77,0x67,0x42},
-       {0x5C,0xD5,0x4C,0xA8,0x3D,0xEF,0x57,0xDA},
-       {0x02,0x48,0xD4,0x38,0x06,0xF6,0x71,0x72},
-       {0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A},
-       {0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2},
-       {0x05,0x9B,0x5E,0x08,0x51,0xCF,0x14,0x3A},
-       {0x07,0x56,0xD8,0xE0,0x77,0x47,0x61,0xD2},
-       {0x76,0x25,0x14,0xB8,0x29,0xBF,0x48,0x6A},
-       {0x3B,0xDD,0x11,0x90,0x49,0x37,0x28,0x02},
-       {0x26,0x95,0x5F,0x68,0x35,0xAF,0x60,0x9A},
-       {0x16,0x4D,0x5E,0x40,0x4F,0x27,0x52,0x32},
-       {0x6B,0x05,0x6E,0x18,0x75,0x9F,0x5C,0xCA},
-       {0x00,0x4B,0xD6,0xEF,0x09,0x17,0x60,0x62},
-       {0x48,0x0D,0x39,0x00,0x6E,0xE7,0x62,0xF2},
-       {0x43,0x75,0x40,0xC8,0x69,0x8F,0x3C,0xFA},
-       {0x07,0x2D,0x43,0xA0,0x77,0x07,0x52,0x92},
-       {0x02,0xFE,0x55,0x77,0x81,0x17,0xF1,0x2A},
-       {0x1D,0x9D,0x5C,0x50,0x18,0xF7,0x28,0xC2},
-       {0x30,0x55,0x32,0x28,0x6D,0x6F,0x29,0x5A},
-       {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-       {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-       {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-       {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-       {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-       {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-       {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}};
-
-static unsigned char cipher_data[NUM_TESTS][8]={
-       {0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7},
-       {0x73,0x59,0xB2,0x16,0x3E,0x4E,0xDC,0x58},
-       {0x95,0x8E,0x6E,0x62,0x7A,0x05,0x55,0x7B},
-       {0xF4,0x03,0x79,0xAB,0x9E,0x0E,0xC5,0x33},
-       {0x17,0x66,0x8D,0xFC,0x72,0x92,0x53,0x2D},
-       {0x8A,0x5A,0xE1,0xF8,0x1A,0xB8,0xF2,0xDD},
-       {0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7},
-       {0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4},
-       {0x69,0x0F,0x5B,0x0D,0x9A,0x26,0x93,0x9B},
-       {0x7A,0x38,0x9D,0x10,0x35,0x4B,0xD2,0x71},
-       {0x86,0x8E,0xBB,0x51,0xCA,0xB4,0x59,0x9A},
-       {0x71,0x78,0x87,0x6E,0x01,0xF1,0x9B,0x2A},
-       {0xAF,0x37,0xFB,0x42,0x1F,0x8C,0x40,0x95},
-       {0x86,0xA5,0x60,0xF1,0x0E,0xC6,0xD8,0x5B},
-       {0x0C,0xD3,0xDA,0x02,0x00,0x21,0xDC,0x09},
-       {0xEA,0x67,0x6B,0x2C,0xB7,0xDB,0x2B,0x7A},
-       {0xDF,0xD6,0x4A,0x81,0x5C,0xAF,0x1A,0x0F},
-       {0x5C,0x51,0x3C,0x9C,0x48,0x86,0xC0,0x88},
-       {0x0A,0x2A,0xEE,0xAE,0x3F,0xF4,0xAB,0x77},
-       {0xEF,0x1B,0xF0,0x3E,0x5D,0xFA,0x57,0x5A},
-       {0x88,0xBF,0x0D,0xB6,0xD7,0x0D,0xEE,0x56},
-       {0xA1,0xF9,0x91,0x55,0x41,0x02,0x0B,0x56},
-       {0x6F,0xBF,0x1C,0xAF,0xCF,0xFD,0x05,0x56},
-       {0x2F,0x22,0xE4,0x9B,0xAB,0x7C,0xA1,0xAC},
-       {0x5A,0x6B,0x61,0x2C,0xC2,0x6C,0xCE,0x4A},
-       {0x5F,0x4C,0x03,0x8E,0xD1,0x2B,0x2E,0x41},
-       {0x63,0xFA,0xC0,0xD0,0x34,0xD9,0xF7,0x93},
-       {0x61,0x7B,0x3A,0x0C,0xE8,0xF0,0x71,0x00},
-       {0xDB,0x95,0x86,0x05,0xF8,0xC8,0xC6,0x06},
-       {0xED,0xBF,0xD1,0xC6,0x6C,0x29,0xCC,0xC7},
-       {0x35,0x55,0x50,0xB2,0x15,0x0E,0x24,0x51},
-       {0xCA,0xAA,0xAF,0x4D,0xEA,0xF1,0xDB,0xAE},
-       {0xD5,0xD4,0x4F,0xF7,0x20,0x68,0x3D,0x0D},
-       {0x2A,0x2B,0xB0,0x08,0xDF,0x97,0xC2,0xF2}};
-
-static unsigned char cipher_ecb2[NUM_TESTS-1][8]={
-       {0x92,0x95,0xB5,0x9B,0xB3,0x84,0x73,0x6E},
-       {0x19,0x9E,0x9D,0x6D,0xF3,0x9A,0xA8,0x16},
-       {0x2A,0x4B,0x4D,0x24,0x52,0x43,0x84,0x27},
-       {0x35,0x84,0x3C,0x01,0x9D,0x18,0xC5,0xB6},
-       {0x4A,0x5B,0x2F,0x42,0xAA,0x77,0x19,0x25},
-       {0xA0,0x6B,0xA9,0xB8,0xCA,0x5B,0x17,0x8A},
-       {0xAB,0x9D,0xB7,0xFB,0xED,0x95,0xF2,0x74},
-       {0x3D,0x25,0x6C,0x23,0xA7,0x25,0x2F,0xD6},
-       {0xB7,0x6F,0xAB,0x4F,0xBD,0xBD,0xB7,0x67},
-       {0x8F,0x68,0x27,0xD6,0x9C,0xF4,0x1A,0x10},
-       {0x82,0x57,0xA1,0xD6,0x50,0x5E,0x81,0x85},
-       {0xA2,0x0F,0x0A,0xCD,0x80,0x89,0x7D,0xFA},
-       {0xCD,0x2A,0x53,0x3A,0xDB,0x0D,0x7E,0xF3},
-       {0xD2,0xC2,0xBE,0x27,0xE8,0x1B,0x68,0xE3},
-       {0xE9,0x24,0xCF,0x4F,0x89,0x3C,0x5B,0x0A},
-       {0xA7,0x18,0xC3,0x9F,0xFA,0x9F,0xD7,0x69},
-       {0x77,0x2C,0x79,0xB1,0xD2,0x31,0x7E,0xB1},
-       {0x49,0xAB,0x92,0x7F,0xD0,0x22,0x00,0xB7},
-       {0xCE,0x1C,0x6C,0x7D,0x85,0xE3,0x4A,0x6F},
-       {0xBE,0x91,0xD6,0xE1,0x27,0xB2,0xE9,0x87},
-       {0x70,0x28,0xAE,0x8F,0xD1,0xF5,0x74,0x1A},
-       {0xAA,0x37,0x80,0xBB,0xF3,0x22,0x1D,0xDE},
-       {0xA6,0xC4,0xD2,0x5E,0x28,0x93,0xAC,0xB3},
-       {0x22,0x07,0x81,0x5A,0xE4,0xB7,0x1A,0xAD},
-       {0xDC,0xCE,0x05,0xE7,0x07,0xBD,0xF5,0x84},
-       {0x26,0x1D,0x39,0x2C,0xB3,0xBA,0xA5,0x85},
-       {0xB4,0xF7,0x0F,0x72,0xFB,0x04,0xF0,0xDC},
-       {0x95,0xBA,0xA9,0x4E,0x87,0x36,0xF2,0x89},
-       {0xD4,0x07,0x3A,0xF1,0x5A,0x17,0x82,0x0E},
-       {0xEF,0x6F,0xAF,0xA7,0x66,0x1A,0x7E,0x89},
-       {0xC1,0x97,0xF5,0x58,0x74,0x8A,0x20,0xE7},
-       {0x43,0x34,0xCF,0xDA,0x22,0xC4,0x86,0xC8},
-       {0x08,0xD7,0xB4,0xFB,0x62,0x9D,0x08,0x85}};
-
-static unsigned char cbc_key [8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-static unsigned char cbc2_key[8]={0xf1,0xe0,0xd3,0xc2,0xb5,0xa4,0x97,0x86};
-static unsigned char cbc3_key[8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
-static unsigned char cbc_iv  [8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
-/* Changed the following text constant to binary so it will work on ebcdic
- * machines :-) */
-/* static char cbc_data[40]="7654321 Now is the time for \0001"; */
-static unsigned char cbc_data[40]={
-       0x37,0x36,0x35,0x34,0x33,0x32,0x31,0x20,
-       0x4E,0x6F,0x77,0x20,0x69,0x73,0x20,0x74,
-       0x68,0x65,0x20,0x74,0x69,0x6D,0x65,0x20,
-       0x66,0x6F,0x72,0x20,0x00,0x31,0x00,0x00,
-       0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-       };
-
-static unsigned char cbc_ok[32]={
-       0xcc,0xd1,0x73,0xff,0xab,0x20,0x39,0xf4,
-       0xac,0xd8,0xae,0xfd,0xdf,0xd8,0xa1,0xeb,
-       0x46,0x8e,0x91,0x15,0x78,0x88,0xba,0x68,
-       0x1d,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
-
-#ifdef SCREW_THE_PARITY
-#error "SCREW_THE_PARITY is not ment to be defined."
-#error "Original vectors are preserved for reference only."
-static unsigned char cbc2_key[8]={0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87};
-static unsigned char xcbc_ok[32]={
-       0x86,0x74,0x81,0x0D,0x61,0xA4,0xA5,0x48,
-       0xB9,0x93,0x03,0xE1,0xB8,0xBB,0xBD,0xBD,
-       0x64,0x30,0x0B,0xB9,0x06,0x65,0x81,0x76,
-       0x04,0x1D,0x77,0x62,0x17,0xCA,0x2B,0xD2,
-       };
-#else
-static unsigned char xcbc_ok[32]={
-       0x84,0x6B,0x29,0x14,0x85,0x1E,0x9A,0x29,
-       0x54,0x73,0x2F,0x8A,0xA0,0xA6,0x11,0xC1,
-       0x15,0xCD,0xC2,0xD7,0x95,0x1B,0x10,0x53,
-       0xA6,0x3C,0x5E,0x03,0xB2,0x1A,0xA3,0xC4,
-       };
-#endif
-
-static unsigned char cbc3_ok[32]={
-       0x3F,0xE3,0x01,0xC9,0x62,0xAC,0x01,0xD0,
-       0x22,0x13,0x76,0x3C,0x1C,0xBD,0x4C,0xDC,
-       0x79,0x96,0x57,0xC0,0x64,0xEC,0xF5,0xD4,
-       0x1C,0x67,0x38,0x12,0xCF,0xDE,0x96,0x75};
-
-static unsigned char pcbc_ok[32]={



Home | Main Index | Thread Index | Old Index