projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commits changes to various parts of libcrypto required by the recent
[openssl.git]
/
crypto
/
evp
/
evp_test.c
diff --git
a/crypto/evp/evp_test.c
b/crypto/evp/evp_test.c
index fa3c9221bb16211be347c88a362566fce066456a..b569678fdda1257b0685d08dba1a5ccf8e822e27 100644
(file)
--- a/
crypto/evp/evp_test.c
+++ b/
crypto/evp/evp_test.c
@@
-217,7
+217,6
@@
static int test_cipher(const char *cipher,const unsigned char *key,int kn,
const unsigned char *ciphertext,int cn)
{
const EVP_CIPHER *c;
const unsigned char *ciphertext,int cn)
{
const EVP_CIPHER *c;
- ENGINE *e;
c=EVP_get_cipherbyname(cipher);
if(!c)
c=EVP_get_cipherbyname(cipher);
if(!c)
@@
-225,16
+224,6
@@
static int test_cipher(const char *cipher,const unsigned char *key,int kn,
test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn);
test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn);
- for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))
- {
- c=ENGINE_get_cipher_by_name(e,cipher);
- if(!c)
- continue;
- printf("Testing engine %s\n",ENGINE_get_name(e));
-
- test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn);
- }
-
return 1;
}
return 1;
}
@@
-315,8
+304,10
@@
int main(int argc,char **argv)
exit(2);
}
exit(2);
}
+ /* Load up the software EVP_CIPHER and EVP_MD definitions */
OpenSSL_add_all_ciphers();
OpenSSL_add_all_digests();
OpenSSL_add_all_ciphers();
OpenSSL_add_all_digests();
+ /* Load all compiled-in ENGINEs */
ENGINE_load_builtin_engines();
for( ; ; )
ENGINE_load_builtin_engines();
for( ; ; )