X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Fciphername_test.c;h=c82a1648277aeed3af32182deb50d38b1033d613;hb=4fcd15c18ad6b5523a389863d3e5628d44db6eb4;hp=f010a3b8bc7469781821c83187bcf49cc73f87e4;hpb=31a80694d425bf7f3a0ed5cc2ee775d9418a5490;p=oweals%2Fopenssl.git diff --git a/test/ciphername_test.c b/test/ciphername_test.c index f010a3b8bc..c82a164827 100644 --- a/test/ciphername_test.c +++ b/test/ciphername_test.c @@ -1,8 +1,8 @@ /* - * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved. * Copyright 2017 BaishanCloud. All rights reserved. * - * Licensed under the OpenSSL licenses, (the "License"); + * Licensed under the Apache License 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * https://www.openssl.org/source/license.html @@ -19,9 +19,11 @@ #include #include -#include "e_os.h" +#include "internal/nelem.h" #include "testutil.h" +DEFINE_STACK_OF(SSL_CIPHER) + typedef struct cipher_id_name { int id; const char *name; @@ -431,7 +433,7 @@ static int test_cipher_name(void) for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) { c = sk_SSL_CIPHER_value(sk, i); id = SSL_CIPHER_get_id(c) & 0xFFFF; - if ((id == 0xFF85) || (id == 0xFF87)) + if ((id == 0xC102) || (id == 0xFF85) ||(id == 0xFF87)) /* skip GOST2012-GOST8912-GOST891 and GOST2012-NULL-GOST12 */ continue; p = SSL_CIPHER_standard_name(c);