diff options
| author | Ben Laurie <ben@openssl.org> | 1999-04-12 17:23:57 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 1999-04-12 17:23:57 +0000 |
| commit | f73e07cf420ddad22b6148d8cbe28daf84ccae2d (patch) | |
| tree | 3396fc9a31ba5a227211ea9e94600ddc4b4a58f2 /apps/s_client.c | |
| parent | a36a1a5146df87700eb8d3c7091cbd7106c958cf (diff) | |
| download | openssl-f73e07cf420ddad22b6148d8cbe28daf84ccae2d.tar.gz | |
Add type-safe STACKs and SETs.
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index c6b7938de3..7140f8ba2b 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -666,7 +666,8 @@ int full; char *p; static char *space=" "; char buf[BUFSIZ]; - STACK *sk; + STACK_OF(X509) *sk; + STACK_OF(X509_NAME) *sk2; SSL_CIPHER *c; X509_NAME *xn; int j,i; @@ -677,16 +678,16 @@ int full; if (sk != NULL) { BIO_printf(bio,"---\nCertificate chain\n"); - for (i=0; i<sk_num(sk); i++) + for (i=0; i<sk_X509_num(sk); i++) { - X509_NAME_oneline(X509_get_subject_name((X509 *) - sk_value(sk,i)),buf,BUFSIZ); + X509_NAME_oneline(X509_get_subject_name( + sk_X509_value(sk,i)),buf,BUFSIZ); BIO_printf(bio,"%2d s:%s\n",i,buf); - X509_NAME_oneline(X509_get_issuer_name((X509 *) - sk_value(sk,i)),buf,BUFSIZ); + X509_NAME_oneline(X509_get_issuer_name( + sk_X509_value(sk,i)),buf,BUFSIZ); BIO_printf(bio," i:%s\n",buf); if (c_showcerts) - PEM_write_bio_X509(bio,(X509 *) sk_value(sk,i)); + PEM_write_bio_X509(bio,sk_X509_value(sk,i)); } } @@ -707,13 +708,13 @@ int full; else BIO_printf(bio,"no peer certificate available\n"); - sk=SSL_get_client_CA_list(s); - if ((sk != NULL) && (sk_num(sk) > 0)) + sk2=SSL_get_client_CA_list(s); + if ((sk != NULL) && (sk_X509_NAME_num(sk2) > 0)) { BIO_printf(bio,"---\nAcceptable client certificate CA names\n"); - for (i=0; i<sk_num(sk); i++) + for (i=0; i<sk_X509_NAME_num(sk2); i++) { - xn=(X509_NAME *)sk_value(sk,i); + xn=sk_X509_NAME_value(sk2,i); X509_NAME_oneline(xn,buf,sizeof(buf)); BIO_write(bio,buf,strlen(buf)); BIO_write(bio,"\n",1); |