Commit c5055adf authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Revert rc4test removal, it performs additional tests not in evptests.txt 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2789)
parent a633f267

test/build.info

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ IF[{- !$disabled{tests} -}] 
          ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \

          md2test \

          hmactest \

          rc2test rc5test \

          rc2test rc4test rc5test \

          destest sha1test sha256t sha512t \

          mdc2test \

          randtest dhtest enginetest casttest \

test/evptests.txt

+1 −1
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ Plaintext = 37363534333231204E6F77206973207468652074696D6520666F722000000000 
Ciphertext = 3FE301C962AC01D02213763C1CBD4CDC799657C064ECF5D41C673812CFDE9675





# RC4 tests

# RC4 tests (from rc4test)

Cipher = RC4

Key = 0123456789abcdef0123456789abcdef

Plaintext = 0123456789abcdef

test/rc4test.c

0 → 100644
+175 −0
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

 */



#include <stdio.h>

#include <stdlib.h>

#include <string.h>



#include "../e_os.h"



#ifdef OPENSSL_NO_RC4

int main(int argc, char *argv[])

{

    printf("No RC4 support\n");

    return (0);

}

#else

# include <openssl/rc4.h>

# include <openssl/sha.h>



static unsigned char keys[7][30] = {

    {8, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},

    {8, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},

    {8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},

    {4, 0xef, 0x01, 0x23, 0x45},

    {8, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},

    {4, 0xef, 0x01, 0x23, 0x45},

};



static unsigned char data_len[7] = { 8, 8, 8, 20, 28, 10 };



static unsigned char data[7][30] = {

    {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xff},

    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff},

    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff},

    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

     0x00, 0x00, 0x00, 0x00, 0xff},

    {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0,

     0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0,

     0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0,

     0x12, 0x34, 0x56, 0x78, 0xff},

    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff},

    {0},

};



static unsigned char output[7][30] = {

    {0x75, 0xb7, 0x87, 0x80, 0x99, 0xe0, 0xc5, 0x96, 0x00},

    {0x74, 0x94, 0xc2, 0xe7, 0x10, 0x4b, 0x08, 0x79, 0x00},

    {0xde, 0x18, 0x89, 0x41, 0xa3, 0x37, 0x5d, 0x3a, 0x00},

    {0xd6, 0xa1, 0x41, 0xa7, 0xec, 0x3c, 0x38, 0xdf,

     0xbd, 0x61, 0x5a, 0x11, 0x62, 0xe1, 0xc7, 0xba,

     0x36, 0xb6, 0x78, 0x58, 0x00},

    {0x66, 0xa0, 0x94, 0x9f, 0x8a, 0xf7, 0xd6, 0x89,

     0x1f, 0x7f, 0x83, 0x2b, 0xa8, 0x33, 0xc0, 0x0c,

     0x89, 0x2e, 0xbe, 0x30, 0x14, 0x3c, 0xe2, 0x87,

     0x40, 0x01, 0x1e, 0xcf, 0x00},

    {0xd6, 0xa1, 0x41, 0xa7, 0xec, 0x3c, 0x38, 0xdf, 0xbd, 0x61, 0x00},

    {0},

};



int main(int argc, char *argv[])

{

    int i, err = 0;

    int j;

    unsigned char *p;

    RC4_KEY key;

    unsigned char obuf[512];



    for (i = 0; i < 6; i++) {

        RC4_set_key(&key, keys[i][0], &(keys[i][1]));

        memset(obuf, 0, sizeof(obuf));

        RC4(&key, data_len[i], &(data[i][0]), obuf);

        if (memcmp(obuf, output[i], data_len[i] + 1) != 0) {

            printf("error calculating RC4\n");

            printf("output:");

            for (j = 0; j < data_len[i] + 1; j++)

                printf(" %02x", obuf[j]);

            printf("\n");

            printf("expect:");

            p = &(output[i][0]);

            for (j = 0; j < data_len[i] + 1; j++)

                printf(" %02x", *(p++));

            printf("\n");

            err++;

        } else

            printf("test %d ok\n", i);

    }

    printf("test end processing ");

    for (i = 0; i < data_len[3]; i++) {

        RC4_set_key(&key, keys[3][0], &(keys[3][1]));

        memset(obuf, 0, sizeof(obuf));

        RC4(&key, i, &(data[3][0]), obuf);

        if ((memcmp(obuf, output[3], i) != 0) || (obuf[i] != 0)) {

            printf("error in RC4 length processing\n");

            printf("output:");

            for (j = 0; j < i + 1; j++)

                printf(" %02x", obuf[j]);

            printf("\n");

            printf("expect:");

            p = &(output[3][0]);

            for (j = 0; j < i; j++)

                printf(" %02x", *(p++));

            printf(" 00\n");

            err++;

        } else {

            printf(".");

            fflush(stdout);

        }

    }

    printf("done\n");

    printf("test multi-call ");

    for (i = 0; i < data_len[3]; i++) {

        RC4_set_key(&key, keys[3][0], &(keys[3][1]));

        memset(obuf, 0, sizeof(obuf));

        RC4(&key, i, &(data[3][0]), obuf);

        RC4(&key, data_len[3] - i, &(data[3][i]), &(obuf[i]));

        if (memcmp(obuf, output[3], data_len[3] + 1) != 0) {

            printf("error in RC4 multi-call processing\n");

            printf("output:");

            for (j = 0; j < data_len[3] + 1; j++)

                printf(" %02x", obuf[j]);

            printf("\n");

            printf("expect:");

            p = &(output[3][0]);

            for (j = 0; j < data_len[3] + 1; j++)

                printf(" %02x", *(p++));

            err++;

        } else {

            printf(".");

            fflush(stdout);

        }

    }

    printf("done\n");

    printf("bulk test ");

    {

        unsigned char buf[513];

        SHA_CTX c;

        unsigned char md[SHA_DIGEST_LENGTH];

        static unsigned char expected[] = {

            0xa4, 0x7b, 0xcc, 0x00, 0x3d, 0xd0, 0xbd, 0xe1, 0xac, 0x5f,

            0x12, 0x1e, 0x45, 0xbc, 0xfb, 0x1a, 0xa1, 0xf2, 0x7f, 0xc5

        };



        RC4_set_key(&key, keys[0][0], &(keys[3][1]));

        memset(buf, 0, sizeof(buf));

        SHA1_Init(&c);

        for (i = 0; i < 2571; i++) {

            RC4(&key, sizeof(buf), buf, buf);

            SHA1_Update(&c, buf, sizeof(buf));

        }

        SHA1_Final(md, &c);



        if (memcmp(md, expected, sizeof(md))) {

            printf("error in RC4 bulk test\n");

            printf("output:");

            for (j = 0; j < (int)sizeof(md); j++)

                printf(" %02x", md[j]);

            printf("\n");

            printf("expect:");

            for (j = 0; j < (int)sizeof(md); j++)

                printf(" %02x", expected[j]);

            printf("\n");

            err++;

        } else

            printf("ok\n");

    }

    EXIT(err);

}

#endif

test/recipes/05-test_rc4.t

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#! /usr/bin/env perl

# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.

#

# Licensed under the OpenSSL license (the "License").  You may not use

# this file except in compliance with the License.  You can obtain a copy

# in the file LICENSE in the source distribution or at

# https://www.openssl.org/source/license.html



use OpenSSL::Test::Simple;



simple_test("test_rc4", "rc4test", "rc4");