diff options
Diffstat (limited to 'deps/openssl/openssl/test/igetest.c')
| -rw-r--r-- | deps/openssl/openssl/test/igetest.c | 73 |
1 files changed, 15 insertions, 58 deletions
diff --git a/deps/openssl/openssl/test/igetest.c b/deps/openssl/openssl/test/igetest.c index 748685d144..fe5bbf16e2 100644 --- a/deps/openssl/openssl/test/igetest.c +++ b/deps/openssl/openssl/test/igetest.c @@ -1,59 +1,19 @@ -/* test/igetest.c */ -/* ==================================================================== - * Copyright (c) 2006 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT 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. - * ==================================================================== +/* + * Copyright 2006-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 <openssl/crypto.h> #include <openssl/aes.h> #include <openssl/rand.h> #include <stdio.h> #include <string.h> #include <assert.h> +#include "e_os.h" #define TEST_SIZE 128 #define BIG_TEST_SIZE 10240 @@ -190,8 +150,7 @@ static int run_test_vectors(void) unsigned int n; int errs = 0; - for (n = 0; n < sizeof(ige_test_vectors) / sizeof(ige_test_vectors[0]); - ++n) { + for (n = 0; n < OSSL_NELEM(ige_test_vectors); ++n) { const struct ige_test *const v = &ige_test_vectors[n]; AES_KEY key; unsigned char buf[MAX_VECTOR_SIZE]; @@ -234,9 +193,7 @@ static int run_test_vectors(void) } } - for (n = 0; - n < sizeof(bi_ige_test_vectors) / sizeof(bi_ige_test_vectors[0]); - ++n) { + for (n = 0; n < OSSL_NELEM(bi_ige_test_vectors); ++n) { const struct bi_ige_test *const v = &bi_ige_test_vectors[n]; AES_KEY key1; AES_KEY key2; @@ -288,9 +245,9 @@ int main(int argc, char **argv) assert(BIG_TEST_SIZE >= TEST_SIZE); - RAND_pseudo_bytes(rkey, sizeof(rkey)); - RAND_pseudo_bytes(plaintext, sizeof(plaintext)); - RAND_pseudo_bytes(iv, sizeof(iv)); + RAND_bytes(rkey, sizeof(rkey)); + RAND_bytes(plaintext, sizeof(plaintext)); + RAND_bytes(iv, sizeof(iv)); memcpy(saved_iv, iv, sizeof(saved_iv)); /* Forward IGE only... */ @@ -355,7 +312,7 @@ int main(int argc, char **argv) } /* make sure garble extends forwards only */ - AES_set_encrypt_key(rkey, 8 * sizeof(rkey), &key); + AES_set_encrypt_key(rkey, 8 * sizeof(rkey),&key); memcpy(iv, saved_iv, sizeof(iv)); AES_ige_encrypt(plaintext, ciphertext, sizeof(plaintext), &key, iv, AES_ENCRYPT); @@ -389,7 +346,7 @@ int main(int argc, char **argv) */ /* possible with biIGE, so the IV is not updated. */ - RAND_pseudo_bytes(rkey2, sizeof(rkey2)); + RAND_bytes(rkey2, sizeof(rkey2)); /* Straight encrypt/decrypt */ AES_set_encrypt_key(rkey, 8 * sizeof(rkey), &key); |