summaryrefslogtreecommitdiff
path: root/ssl/ssl_locl.h
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2011-12-13 14:25:11 +0000
committerBen Laurie <ben@openssl.org>2011-12-13 14:25:11 +0000
commite87afb15187b7bb3d5ad8dda0538412b75201c95 (patch)
tree4f9ad64a4d29060a143511c27adde121f2b22ff4 /ssl/ssl_locl.h
parent7b467c6b81bc23022470bbfa2771875c86ebaf6a (diff)
downloadopenssl-new-e87afb15187b7bb3d5ad8dda0538412b75201c95.tar.gz
SSL export fixes (from Adam Langley).
Diffstat (limited to 'ssl/ssl_locl.h')
-rw-r--r--ssl/ssl_locl.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 496d0a0109..80a0749d26 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -571,9 +571,9 @@ typedef struct ssl3_enc_method
const char *server_finished_label;
int server_finished_label_len;
int (*alert_value)(int);
- int (*export_keying_material)(SSL *, unsigned char *, unsigned int,
- const char *, unsigned int,
- const unsigned char *, unsigned int,
+ int (*export_keying_material)(SSL *, unsigned char *, size_t,
+ const char *, size_t,
+ const unsigned char *, size_t,
int use_context);
} SSL3_ENC_METHOD;
@@ -1061,9 +1061,9 @@ int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
int tls1_mac(SSL *ssl, unsigned char *md, int snd);
int tls1_generate_master_secret(SSL *s, unsigned char *out,
unsigned char *p, int len);
-int tls1_export_keying_material(SSL *s, unsigned char *out, unsigned int olen,
- const char *label, unsigned int llen, const unsigned char *p,
- unsigned int plen, int use_context);
+int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
+ const char *label, size_t llen,
+ const unsigned char *p, size_t plen, int use_context);
int tls1_alert_code(int code);
int ssl3_alert_code(int code);
int ssl_ok(SSL *s);