diff options
author | guenther <> | 2016-11-04 17:58:19 +0000 |
---|---|---|
committer | guenther <> | 2016-11-04 17:58:19 +0000 |
commit | 8c6f31f782260e2f6b732ffdcf678b7e6ccb0ff6 (patch) | |
tree | fbbfc2fed167f767d78e3d3d89497b3aa1af27b8 /src/lib | |
parent | 40cb990b803537837f7b38fd65d2d48fec20e014 (diff) | |
download | openbsd-8c6f31f782260e2f6b732ffdcf678b7e6ccb0ff6.tar.gz openbsd-8c6f31f782260e2f6b732ffdcf678b7e6ccb0ff6.tar.bz2 openbsd-8c6f31f782260e2f6b732ffdcf678b7e6ccb0ff6.zip |
Fix some linewrapping glitches
ok jsing@
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libssl/ssl.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 1b12d99063..b9f772d484 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.99 2016/11/02 10:59:25 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.100 2016/11/04 17:58:19 guenther Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -951,8 +951,7 @@ void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx, | |||
951 | void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, | 951 | void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, |
952 | int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, | 952 | int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, |
953 | unsigned int cookie_len)); | 953 | unsigned int cookie_len)); |
954 | void | 954 | void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s, int (*cb)(SSL *ssl, |
955 | SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s, int (*cb)(SSL *ssl, | ||
956 | const unsigned char **out, unsigned int *outlen, void *arg), void *arg); | 955 | const unsigned char **out, unsigned int *outlen, void *arg), void *arg); |
957 | void SSL_CTX_set_next_proto_select_cb(SSL_CTX *s, int (*cb)(SSL *ssl, | 956 | void SSL_CTX_set_next_proto_select_cb(SSL_CTX *s, int (*cb)(SSL *ssl, |
958 | unsigned char **out, unsigned char *outlen, const unsigned char *in, | 957 | unsigned char **out, unsigned char *outlen, const unsigned char *in, |
@@ -1598,10 +1597,9 @@ long SSL_SESSION_set_time(SSL_SESSION *s, long t); | |||
1598 | long SSL_SESSION_get_timeout(const SSL_SESSION *s); | 1597 | long SSL_SESSION_get_timeout(const SSL_SESSION *s); |
1599 | long SSL_SESSION_set_timeout(SSL_SESSION *s, long t); | 1598 | long SSL_SESSION_set_timeout(SSL_SESSION *s, long t); |
1600 | void SSL_copy_session_id(SSL *to, const SSL *from); | 1599 | void SSL_copy_session_id(SSL *to, const SSL *from); |
1601 | X509 *SSL_SESSION_get0_peer(SSL_SESSION *s); | 1600 | X509 *SSL_SESSION_get0_peer(SSL_SESSION *s); |
1602 | int | 1601 | int SSL_SESSION_set1_id_context(SSL_SESSION *s, |
1603 | SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx, | 1602 | const unsigned char *sid_ctx, unsigned int sid_ctx_len); |
1604 | unsigned int sid_ctx_len); | ||
1605 | 1603 | ||
1606 | SSL_SESSION *SSL_SESSION_new(void); | 1604 | SSL_SESSION *SSL_SESSION_new(void); |
1607 | const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, | 1605 | const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, |