From: tb Date: Wed, 29 Dec 2021 22:53:04 +0000 (+0000) Subject: knfmt makes this slightly nicer. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ff5e2a581621dee98786db7db2d796e6e76a220f;p=openbsd knfmt makes this slightly nicer. --- diff --git a/regress/lib/libcrypto/sha1/sha1test.c b/regress/lib/libcrypto/sha1/sha1test.c index 537454851bd..f1cf09d5520 100644 --- a/regress/lib/libcrypto/sha1/sha1test.c +++ b/regress/lib/libcrypto/sha1/sha1test.c @@ -1,25 +1,25 @@ -/* $OpenBSD: sha1test.c,v 1.4 2021/11/18 15:23:24 tb Exp $ */ +/* $OpenBSD: sha1test.c,v 1.5 2021/12/29 22:53:04 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * 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). - * + * * 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: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * 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 + * 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)" - * + * * 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 @@ -49,7 +49,7 @@ * 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 @@ -63,26 +63,27 @@ #include #include -static char *test[]={ +static char *test[] = { "abc", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", NULL, - }; +}; -static char *ret[]={ +static char *ret[] = { "a9993e364706816aba3e25717850c26c9cd0d89d", "84983e441c3bd26ebaae4aa1f95129e5e54670f1", - }; -static char *bigret= - "34aa973cd4c4daa4f61eeb2bdbad27316534016f"; +}; +static char *bigret = + "34aa973cd4c4daa4f61eeb2bdbad27316534016f"; static char *pt(unsigned char *md); -int main(int argc, char *argv[]) - { - int i,err=0; - char **P,**R; +int +main(int argc, char *argv[]) +{ + int i, err = 0; + char **P, **R; static unsigned char buf[1000]; - char *p,*r; + char *p, *r; EVP_MD_CTX *c; unsigned char md[SHA_DIGEST_LENGTH]; @@ -90,53 +91,49 @@ int main(int argc, char *argv[]) printf("EVP_MD_CTX_new() failed\n"); return 1; } - P=test; - R=ret; - i=1; - while (*P != NULL) - { - EVP_Digest(*P,strlen((char *)*P),md,NULL,EVP_sha1(), NULL); - p=pt(md); - if (strcmp(p,(char *)*R) != 0) - { - printf("error calculating SHA1 on '%s'\n",*P); - printf("got %s instead of %s\n",p,*R); + P = test; + R = ret; + i = 1; + while (*P != NULL) { + EVP_Digest(*P, strlen((char *)*P), md, NULL, EVP_sha1(), NULL); + p = pt(md); + if (strcmp(p, (char *)*R) != 0) { + printf("error calculating SHA1 on '%s'\n", *P); + printf("got %s instead of %s\n", p, *R); err++; - } - else - printf("test %d ok\n",i); + } else + printf("test %d ok\n", i); i++; R++; P++; - } + } - memset(buf,'a',1000); - EVP_DigestInit_ex(c,EVP_sha1(), NULL); - for (i=0; i<1000; i++) - EVP_DigestUpdate(c,buf,1000); - EVP_DigestFinal_ex(c,md,NULL); - p=pt(md); + memset(buf, 'a', 1000); + EVP_DigestInit_ex(c, EVP_sha1(), NULL); + for (i = 0; i < 1000; i++) + EVP_DigestUpdate(c, buf, 1000); + EVP_DigestFinal_ex(c, md, NULL); + p = pt(md); - r=bigret; - if (strcmp(p,r) != 0) - { + r = bigret; + if (strcmp(p, r) != 0) { printf("error calculating SHA1 on 'a' * 1000\n"); - printf("got %s instead of %s\n",p,r); + printf("got %s instead of %s\n", p, r); err++; - } - else + } else printf("test 3 ok\n"); EVP_MD_CTX_free(c); exit(err); - } +} -static char *pt(unsigned char *md) - { +static char * +pt(unsigned char *md) +{ int i; static char buf[80]; - for (i=0; i