Commit 850b55a9 authored by Pauli's avatar Pauli Committed by Matt Caswell
Browse files

Update mdc2test to use the test infrastructure 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3164)
parent e49429aa

test/build.info

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ IF[{- !$disabled{tests} -}] 
  INCLUDE[sha512t]=../include

  DEPEND[sha512t]=../libcrypto



  SOURCE[mdc2test]=mdc2test.c

  SOURCE[mdc2test]=mdc2test.c testutil.c test_main.c

  INCLUDE[mdc2test]=../include

  DEPEND[mdc2test]=../libcrypto

test/mdc2test.c

+29 −50
Original line number Diff line number Diff line 
/*

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

 * Copyright 1995-2017 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
@@ -7,23 +7,17 @@ 
 * https://www.openssl.org/source/license.html

 */



#include <stdio.h>

#include <stdlib.h>

#include <string.h>



#include "../e_os.h"

#include "test_main.h"

#include "testutil.h"



#if defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_MDC2)

# define OPENSSL_NO_MDC2

#endif



#ifdef OPENSSL_NO_MDC2

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

{

    printf("No MDC2 support\n");

    return (0);

}

#else

#ifndef OPENSSL_NO_MDC2

# include <openssl/evp.h>

# include <openssl/mdc2.h>
@@ -41,59 +35,44 @@ static unsigned char pad2[16] = { 
    0x35, 0xD8, 0x7A, 0xFE, 0xAB, 0x33, 0xBE, 0xE2

};



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

static int test_mdc2(void)

{

    int ret = 1;

    int testresult = 0;

    unsigned char md[MDC2_DIGEST_LENGTH];

    int i;

    EVP_MD_CTX *c;

    static char text[] = "Now is the time for all ";

    size_t tlen = strlen(text);



# ifdef CHARSET_EBCDIC

    ebcdic2ascii(text, text, strlen(text));

    ebcdic2ascii(text, text, tlen);

# endif



    c = EVP_MD_CTX_new();

    if (c == NULL

        || !EVP_DigestInit_ex(c, EVP_mdc2(), NULL)

        || !EVP_DigestUpdate(c, (unsigned char *)text, strlen(text))

        || !EVP_DigestFinal_ex(c, &(md[0]), NULL))

        goto err;

    if (!TEST_ptr(c)

        || !TEST_true(EVP_DigestInit_ex(c, EVP_mdc2(), NULL))

        || !TEST_true(EVP_DigestUpdate(c, (unsigned char *)text, tlen))

        || !TEST_true(EVP_DigestFinal_ex(c, &(md[0]), NULL))

        || !TEST_mem_eq(md, MDC2_DIGEST_LENGTH, pad1, MDC2_DIGEST_LENGTH)

        || !TEST_true(EVP_DigestInit_ex(c, EVP_mdc2(), NULL)))

        goto end;



    if (memcmp(md, pad1, MDC2_DIGEST_LENGTH) != 0) {

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

            printf("%02X", md[i]);

        printf(" <- generated\n");

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

            printf("%02X", pad1[i]);

        printf(" <- correct\n");

        goto err;

    } else {

        printf("pad1 - ok\n");

    }



    if (!EVP_DigestInit_ex(c, EVP_mdc2(), NULL))

        goto err;

    /* FIXME: use a ctl function? */

    ((MDC2_CTX *)EVP_MD_CTX_md_data(c))->pad_type = 2;

    if (!EVP_DigestUpdate(c, (unsigned char *)text, strlen(text))

        || !EVP_DigestFinal_ex(c, &(md[0]), NULL))

        goto err;



    if (memcmp(md, pad2, MDC2_DIGEST_LENGTH) != 0) {

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

            printf("%02X", md[i]);

        printf(" <- generated\n");

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

            printf("%02X", pad2[i]);

        printf(" <- correct\n");

    } else {

        printf("pad2 - ok\n");

        ret = 0;

    }

    if (!TEST_true(EVP_DigestUpdate(c, (unsigned char *)text, tlen))

        || !TEST_true(EVP_DigestFinal_ex(c, &(md[0]), NULL))

        || !TEST_mem_eq(md, MDC2_DIGEST_LENGTH, pad2, MDC2_DIGEST_LENGTH))

        goto end;



 err:

    testresult = 1;

 end:

    EVP_MD_CTX_free(c);

    EXIT(ret);

    return testresult;

}

#endif



void register_tests(void)

{

#ifndef OPENSSL_NO_MDC2

    ADD_TEST(test_mdc2);

#endif

}