diff options
| author | Ben Laurie <ben@openssl.org> | 1999-02-21 21:03:24 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 1999-02-21 21:03:24 +0100 |
| commit | 06ab81f9f7b055a4456798cb9ef3266160438a08 (patch) | |
| tree | 880b224a7f2e8224efeb0d4783ebe5e522d91c94 /ssl/ssl_lib.c | |
| parent | Fix warning. (diff) | |
| download | openssl-06ab81f9f7b055a4456798cb9ef3266160438a08.tar.xz openssl-06ab81f9f7b055a4456798cb9ef3266160438a08.zip | |
Add support for new TLS export ciphersuites.
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 2019a400ff..862a555efa 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1236,13 +1236,13 @@ SSL *s; { unsigned long alg,mask,kalg; CERT *c; - int i,export; + int i,_export; c=s->cert; ssl_set_cert_masks(c); alg=s->s3->tmp.new_cipher->algorithms; - export=(alg & SSL_EXPORT)?1:0; - mask=(export)?c->export_mask:c->mask; + _export=SSL_IS_EXPORT(alg); + mask=_export?c->export_mask:c->mask; kalg=alg&(SSL_MKEY_MASK|SSL_AUTH_MASK); if (kalg & SSL_kDHr) @@ -1822,12 +1822,12 @@ void (*free_func)(); int SSL_set_ex_data(s,idx,arg) SSL *s; int idx; -char *arg; +void *arg; { return(CRYPTO_set_ex_data(&s->ex_data,idx,arg)); } -char *SSL_get_ex_data(s,idx) +void *SSL_get_ex_data(s,idx) SSL *s; int idx; { @@ -1849,12 +1849,12 @@ void (*free_func)(); int SSL_CTX_set_ex_data(s,idx,arg) SSL_CTX *s; int idx; -char *arg; +void *arg; { return(CRYPTO_set_ex_data(&s->ex_data,idx,arg)); } -char *SSL_CTX_get_ex_data(s,idx) +void *SSL_CTX_get_ex_data(s,idx) SSL_CTX *s; int idx; { |