diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-02-26 12:02:31 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-02-26 12:02:31 +0100 |
| commit | c131593d48bd10571071b1dbeb3d5c5e88becba8 (patch) | |
| tree | 8c65f71a465f7b194322bc4e282892a57dc3fb76 /crypto/threads | |
| parent | More get0 et al. changes. Also provide fgrep targets in CHANGES (diff) | |
| download | openssl-c131593d48bd10571071b1dbeb3d5c5e88becba8.tar.xz openssl-c131593d48bd10571071b1dbeb3d5c5e88becba8.zip | |
Make sure there's some entropy, and log a few more errors.
Diffstat (limited to 'crypto/threads')
| -rw-r--r-- | crypto/threads/mttest.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/crypto/threads/mttest.c b/crypto/threads/mttest.c index 47faef53c4..24713a3157 100644 --- a/crypto/threads/mttest.c +++ b/crypto/threads/mttest.c @@ -84,6 +84,7 @@ #include <openssl/x509.h> #include <openssl/ssl.h> #include <openssl/err.h> +#include <openssl/rand.h> #ifdef NO_FP_API #define APPS_WIN16 @@ -123,6 +124,8 @@ int number_of_loops=10; int reconnect=0; int cache_stats=0; +static const char rnd_seed[] = "string to make the random number generator think it has entropy"; + int doit(char *ctx[4]); static void print_stats(FILE *fp, SSL_CTX *ctx) { @@ -172,6 +175,8 @@ int main(int argc, char *argv[]) char *ccert=TEST_CLIENT_CERT; SSL_METHOD *ssl_method=SSLv23_method(); + RAND_seed(rnd_seed, sizeof rnd_seed); + if (bio_err == NULL) bio_err=BIO_new_fp(stderr,BIO_NOCLOSE); if (bio_stdout == NULL) @@ -261,8 +266,15 @@ bad: SSL_CTX_set_session_cache_mode(c_ctx, SSL_SESS_CACHE_NO_AUTO_CLEAR|SSL_SESS_CACHE_SERVER); - SSL_CTX_use_certificate_file(s_ctx,scert,SSL_FILETYPE_PEM); - SSL_CTX_use_RSAPrivateKey_file(s_ctx,scert,SSL_FILETYPE_PEM); + if (!SSL_CTX_use_certificate_file(s_ctx,scert,SSL_FILETYPE_PEM)) + { + ERR_print_errors(bio_err); + } + else if (!SSL_CTX_use_RSAPrivateKey_file(s_ctx,scert,SSL_FILETYPE_PEM)) + { + ERR_print_errors(bio_err); + goto end; + } if (client_auth) { @@ -491,6 +503,7 @@ int doit(char *ctx[4]) else { fprintf(stderr,"ERROR in CLIENT\n"); + ERR_print_errors_fp(stderr); return(1); } } @@ -522,6 +535,7 @@ int doit(char *ctx[4]) else { fprintf(stderr,"ERROR in CLIENT\n"); + ERR_print_errors_fp(stderr); return(1); } } |