diff options
| author | Bodo Möller <bodo@openssl.org> | 2000-03-13 22:24:39 +0300 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2000-03-13 22:24:39 +0300 |
| commit | 65b002f39934a755b6db855c9f9ba722d6cef863 (patch) | |
| tree | b26617a66f83a3bd399da887892a6e4af0ba3735 /ssl | |
| parent | bc23b70e47531cabe5b3c329ba0b5d58777fbb7b (diff) | |
Update test suite so that 'make test' succeeds in 'no-rsa' configuration.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssltest.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 76d1521399..2548c8abc5 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -140,6 +140,7 @@ static void sv_usage(void) fprintf(stderr," -CApath arg - PEM format directory of CA's\n"); fprintf(stderr," -CAfile arg - PEM format file of CA's\n"); fprintf(stderr," -cert arg - Certificate file\n"); + fprintf(stderr," -key arg - Key file\n"); fprintf(stderr," -s_cert arg - Just the server certificate file\n"); fprintf(stderr," -c_cert arg - Just the client certificate file\n"); fprintf(stderr," -cipher arg - The cipher list\n"); @@ -202,7 +203,9 @@ int main(int argc, char *argv[]) int client_auth=0; int server_auth=0,i; char *server_cert=TEST_SERVER_CERT; + char *server_key=NULL; char *client_cert=TEST_CLIENT_CERT; + char *client_key=NULL; SSL_CTX *s_ctx=NULL; SSL_CTX *c_ctx=NULL; SSL_METHOD *meth=NULL; @@ -282,11 +285,26 @@ int main(int argc, char *argv[]) if (--argc < 1) goto bad; server_cert= *(++argv); } + else if (strcmp(*argv,"-key") == 0) + { + if (--argc < 1) goto bad; + server_key= *(++argv); + } + else if (strcmp(*argv,"-s_key") == 0) + { + if (--argc < 1) goto bad; + server_key= *(++argv); + } else if (strcmp(*argv,"-c_cert") == 0) { if (--argc < 1) goto bad; client_cert= *(++argv); } + else if (strcmp(*argv,"-c_key") == 0) + { + if (--argc < 1) goto bad; + client_key= *(++argv); + } else if (strcmp(*argv,"-cipher") == 0) { if (--argc < 1) goto bad; @@ -416,8 +434,8 @@ bad: { ERR_print_errors(bio_err); } - else if (!SSL_CTX_use_PrivateKey_file(s_ctx,server_cert, - SSL_FILETYPE_PEM)) + else if (!SSL_CTX_use_PrivateKey_file(s_ctx, + (server_key?server_key:server_cert), SSL_FILETYPE_PEM)) { ERR_print_errors(bio_err); goto end; @@ -427,7 +445,8 @@ bad: { SSL_CTX_use_certificate_file(c_ctx,client_cert, SSL_FILETYPE_PEM); - SSL_CTX_use_PrivateKey_file(c_ctx,client_cert, + SSL_CTX_use_PrivateKey_file(c_ctx, + (client_key?client_key:client_cert), SSL_FILETYPE_PEM); } |