diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | fe047d8b632246cb2db3234a0a4f32e5c318857b (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/evp/evp_test.c | |
| parent | 2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff) | |
| download | openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2 openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/evp/evp_test.c')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/evp/evp_test.c b/src/lib/libcrypto/evp/evp_test.c index 436be20bf1..902efac975 100644 --- a/src/lib/libcrypto/evp/evp_test.c +++ b/src/lib/libcrypto/evp/evp_test.c | |||
| @@ -153,8 +153,8 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn, | |||
| 153 | 153 | ||
| 154 | if(kn != c->key_len) | 154 | if(kn != c->key_len) |
| 155 | { | 155 | { |
| 156 | fprintf(stderr,"Key length doesn't match, got %d expected %d\n",kn, | 156 | fprintf(stderr,"Key length doesn't match, got %d expected %lu\n",kn, |
| 157 | c->key_len); | 157 | (unsigned long)c->key_len); |
| 158 | test1_exit(5); | 158 | test1_exit(5); |
| 159 | } | 159 | } |
| 160 | EVP_CIPHER_CTX_init(&ctx); | 160 | EVP_CIPHER_CTX_init(&ctx); |
| @@ -441,7 +441,7 @@ int main(int argc,char **argv) | |||
| 441 | #endif | 441 | #endif |
| 442 | EVP_cleanup(); | 442 | EVP_cleanup(); |
| 443 | CRYPTO_cleanup_all_ex_data(); | 443 | CRYPTO_cleanup_all_ex_data(); |
| 444 | ERR_remove_state(0); | 444 | ERR_remove_thread_state(NULL); |
| 445 | ERR_free_strings(); | 445 | ERR_free_strings(); |
| 446 | CRYPTO_mem_leaks_fp(stderr); | 446 | CRYPTO_mem_leaks_fp(stderr); |
| 447 | 447 | ||