diff options
author | Geoff Thorpe <geoff@openssl.org> | 2001-09-25 20:23:40 +0000 |
---|---|---|
committer | Geoff Thorpe <geoff@openssl.org> | 2001-09-25 20:23:40 +0000 |
commit | cb78486d97328121add07df466b7578076650a90 (patch) | |
tree | 44de53e7516cf07786dcfaa9add109319fad16ac /crypto/evp/evp_test.c | |
parent | 9c9aa4f145588500cd2d734d1901a31039f145b9 (diff) |
This commits changes to various parts of libcrypto required by the recent
ENGINE surgery. DH, DSA, RAND, and RSA now use *both* "method" and ENGINE
pointers to manage their hooking with ENGINE. Previously their use of
"method" pointers was replaced by use of ENGINE references. See
crypto/engine/README for details.
Also, remove the ENGINE iterations from evp_test - even when the
cipher/digest code is committed in, this functionality would require a
different set of API calls.
Diffstat (limited to 'crypto/evp/evp_test.c')
-rw-r--r-- | crypto/evp/evp_test.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/crypto/evp/evp_test.c b/crypto/evp/evp_test.c index fa3c9221bb..b569678fdd 100644 --- 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; - ENGINE *e; 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); - 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; } @@ -315,8 +304,10 @@ int main(int argc,char **argv) exit(2); } + /* Load up the software EVP_CIPHER and EVP_MD definitions */ OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); + /* Load all compiled-in ENGINEs */ ENGINE_load_builtin_engines(); for( ; ; ) |