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 /ssl/s2_srvr.c | |
| parent | a36a1a5146df87700eb8d3c7091cbd7106c958cf (diff) | |
Add type-safe STACKs and SETs.
Diffstat (limited to 'ssl/s2_srvr.c')
| -rw-r--r-- | ssl/s2_srvr.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index 73c19af807..930a47d4d3 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -465,8 +465,8 @@ SSL *s; { int i,n; unsigned char *p; - STACK *cs; /* a stack of SSL_CIPHERS */ - STACK *cl; /* the ones we want to use */ + STACK_OF(SSL_CIPHER) *cs; /* a stack of SSL_CIPHERS */ + STACK_OF(SSL_CIPHER) *cl; /* the ones we want to use */ int z; /* This is a bit of a hack to check for the correct packet @@ -574,11 +574,11 @@ SSL *s; cl=ssl_get_ciphers_by_id(s); - for (z=0; z<sk_num(cs); z++) + for (z=0; z<sk_SSL_CIPHER_num(cs); z++) { - if (sk_find(cl,sk_value(cs,z)) < 0) + if (sk_SSL_CIPHER_find(cl,sk_SSL_CIPHER_value(cs,z)) < 0) { - sk_delete(cs,z); + sk_SSL_CIPHER_delete(cs,z); z--; } } @@ -608,7 +608,7 @@ SSL *s; { unsigned char *p,*d; int n,hit; - STACK *sk; + STACK_OF(SSL_CIPHER) *sk; p=(unsigned char *)s->init_buf->data; if (s->state == SSL2_ST_SEND_SERVER_HELLO_A) @@ -787,7 +787,7 @@ SSL *s; unsigned char *ccd; int i,j,ctype,ret= -1; X509 *x509=NULL; - STACK *sk=NULL; + STACK_OF(X509) *sk=NULL; ccd=s->s2->tmp.ccl; if (s->state == SSL2_ST_SEND_REQUEST_CERTIFICATE_A) @@ -876,7 +876,7 @@ SSL *s; goto msg_end; } - if (((sk=sk_new_null()) == NULL) || (!sk_push(sk,(char *)x509))) + if (((sk=sk_X509_new_null()) == NULL) || (!sk_X509_push(sk,x509))) { SSLerr(SSL_F_REQUEST_CERTIFICATE,ERR_R_MALLOC_FAILURE); goto msg_end; @@ -933,7 +933,7 @@ msg_end: ssl2_return_error(s,SSL2_PE_BAD_CERTIFICATE); } end: - sk_free(sk); + sk_X509_free(sk); X509_free(x509); return(ret); } |