projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a test for the new early data callback
[openssl.git]
/
test
/
bio_enc_test.c
diff --git
a/test/bio_enc_test.c
b/test/bio_enc_test.c
index 9b0dd6def168cb61d186c90b22e7032c0b262baf..282e8dac61c583f265d7d80c45caec6cba36c421 100644
(file)
--- a/
test/bio_enc_test.c
+++ b/
test/bio_enc_test.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016
-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
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-12,7
+12,6
@@
#include <openssl/bio.h>
#include <openssl/rand.h>
#include <openssl/bio.h>
#include <openssl/rand.h>
-#include "test_main.h"
#include "testutil.h"
#define ENCRYPT 1
#include "testutil.h"
#define ENCRYPT 1
@@
-203,17
+202,21
@@
static int test_bio_enc_aes_256_ofb(int idx)
return do_test_bio_cipher(EVP_aes_256_ofb(), idx);
}
return do_test_bio_cipher(EVP_aes_256_ofb(), idx);
}
+# ifndef OPENSSL_NO_CHACHA
static int test_bio_enc_chacha20(int idx)
{
return do_test_bio_cipher(EVP_chacha20(), idx);
}
static int test_bio_enc_chacha20(int idx)
{
return do_test_bio_cipher(EVP_chacha20(), idx);
}
+# ifndef OPENSSL_NO_POLY1305
static int test_bio_enc_chacha20_poly1305(int idx)
{
return do_test_bio_cipher(EVP_chacha20_poly1305(), idx);
}
static int test_bio_enc_chacha20_poly1305(int idx)
{
return do_test_bio_cipher(EVP_chacha20_poly1305(), idx);
}
+# endif
+# endif
-
void register
_tests(void)
+
int setup
_tests(void)
{
ADD_ALL_TESTS(test_bio_enc_aes_128_cbc, 2);
ADD_ALL_TESTS(test_bio_enc_aes_128_ctr, 2);
{
ADD_ALL_TESTS(test_bio_enc_aes_128_cbc, 2);
ADD_ALL_TESTS(test_bio_enc_aes_128_ctr, 2);
@@
-225,4
+228,5
@@
void register_tests(void)
ADD_ALL_TESTS(test_bio_enc_chacha20_poly1305, 2);
# endif
# endif
ADD_ALL_TESTS(test_bio_enc_chacha20_poly1305, 2);
# endif
# endif
+ return 1;
}
}