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

Update sha1test 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/3167)
parent f46074c7

test/build.info

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

  INCLUDE[destest]=../include

  DEPEND[destest]=../libcrypto

  DEPEND[destest]=../libcrypto





  SOURCE[sha1test]=sha1test.c

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

  INCLUDE[sha1test]=../include

  INCLUDE[sha1test]=../include

  DEPEND[sha1test]=../libcrypto

  DEPEND[sha1test]=../libcrypto

test/sha1test.c

+58 −63
Original line number Original line 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

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

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

 * this file except in compliance with the License.  You can obtain a copy
@@ -9,9 +9,11 @@ 




#include <stdio.h>

#include <stdio.h>

#include <string.h>

#include <string.h>

#include <stdlib.h>





#include "../e_os.h"

#include "../e_os.h"

#include "test_main.h"

#include "testutil.h"



#include <openssl/evp.h>

#include <openssl/evp.h>

#include <openssl/sha.h>

#include <openssl/sha.h>
@@ -31,81 +33,74 @@ static char *ret[] = { 




static char *bigret = "34aa973cd4c4daa4f61eeb2bdbad27316534016f";

static char *bigret = "34aa973cd4c4daa4f61eeb2bdbad27316534016f";





static char *pt(unsigned char *md);

static char *pt(unsigned char *md)

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

{

    int i;

    static char buf[80];



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

        sprintf(&(buf[i * 2]), "%02x", md[i]);

    return buf;

}



static int test_sha1(int i)

{

{

    unsigned int i;

    int err = 0;

    char **R;

    static unsigned char buf[1000];

    char *p, *r;

    EVP_MD_CTX *c;

    EVP_MD_CTX *c;

    unsigned char md[SHA_DIGEST_LENGTH];

    unsigned char md[SHA_DIGEST_LENGTH];

    const size_t tlen = strlen(test[i]);

    int testresult = 0;





    c = EVP_MD_CTX_new();

    c = EVP_MD_CTX_new();

    R = ret;

    if (!TEST_ptr(c))

    for (i = 0; i < OSSL_NELEM(test); i++) {

        goto end;



# ifdef CHARSET_EBCDIC

# ifdef CHARSET_EBCDIC

        ebcdic2ascii(test[i], test[i], strlen(test[i]));

    ebcdic2ascii(test[i], test[i], tlen);

# endif

# endif

        if (!EVP_Digest(test[i], strlen(test[i]), md, NULL, EVP_sha1(),

    if (!TEST_true(EVP_Digest(test[i], tlen, md, NULL, EVP_sha1(), NULL))

            NULL)) {

        || !TEST_str_eq(pt(md), ret[i]))

            printf("EVP_Digest() error\n");

        goto end;

            err++;



            goto err;

    testresult = 1;

        }

 end:

        p = pt(md);

    EVP_MD_CTX_free(c);

        if (strcmp(p, (char *)*R) != 0) {

    return testresult;

            printf("error calculating SHA1 on '%s'\n", test[i]);

            printf("got %s instead of %s\n", p, *R);

            err++;

        } else

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

        R++;

}

}





static int test_sha1_big(void)

{

    static unsigned char buf[1000];

    EVP_MD_CTX *c;

    unsigned char md[SHA_DIGEST_LENGTH];

    int i, testresult = 0;



    c = EVP_MD_CTX_new();

    if (!TEST_ptr(c))

        goto end;



    memset(buf, 'a', 1000);

    memset(buf, 'a', 1000);

#ifdef CHARSET_EBCDIC

#ifdef CHARSET_EBCDIC

    ebcdic2ascii(buf, buf, 1000);

    ebcdic2ascii(buf, buf, 1000);

#endif                         /* CHARSET_EBCDIC */

#endif                         /* CHARSET_EBCDIC */

    if (!EVP_DigestInit_ex(c, EVP_sha1(), NULL)) {

    if (!TEST_true(EVP_DigestInit_ex(c, EVP_sha1(), NULL)))

        printf("EVP_DigestInit_ex() error\n");

        goto end;

        err++;

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

        goto err;

        if (!TEST_true(EVP_DigestUpdate(c, buf, 1000)))

    }

            goto end;

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

    if (!TEST_true(EVP_DigestFinal_ex(c, md, NULL)))

        if (!EVP_DigestUpdate(c, buf, 1000)) {

        goto end;

            printf("EVP_DigestUpdate() error\n");



            err++;

    if (!TEST_str_eq(pt(md), bigret))

            goto err;

        goto end;

        }



    }

    testresult = 1;

    if (!EVP_DigestFinal_ex(c, md, NULL)) {

 end:

            printf("EVP_DigestFinal() error\n");

            err++;

            goto err;

    }

    p = pt(md);



    r = bigret;

    if (strcmp(p, r) != 0) {

        printf("error calculating SHA1 on 'a' * 1000\n");

        printf("got %s instead of %s\n", p, r);

        err++;

    } else

        printf("test 3 ok\n");

 err:

    EVP_MD_CTX_free(c);

    EVP_MD_CTX_free(c);

    EXIT(err);

    return testresult;

    return (0);

}

}





static char *pt(unsigned char *md)

void register_tests(void)

{

{

    int i;

    ADD_ALL_TESTS(test_sha1, OSSL_NELEM(test));

    static char buf[80];

    ADD_TEST(test_sha1_big);



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

        sprintf(&(buf[i * 2]), "%02x", md[i]);

    return (buf);

}
 
}