summaryrefslogtreecommitdiffstats
path: root/ssl/ssl.h
diff options
context:
space:
mode:
authorTim Hudson <tjh@openssl.org>2014-12-28 12:48:40 +1000
committerMatt Caswell <matt@openssl.org>2014-12-30 22:10:26 +0000
commit1d97c8435171a7af575f73c526d79e1ef0ee5960 (patch)
tree99405d276f1713c41130162ac64f6b01c95a0751 /ssl/ssl.h
parentaa8a9266f91ce05068c5bf7eab44263c99d366f3 (diff)
downloadopenssl-1d97c8435171a7af575f73c526d79e1ef0ee5960.tar.gz
mark all block comments that need format preserving so that
indent will not alter them when reformatting comments Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl/ssl.h')
-rw-r--r--ssl/ssl.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 0318d046b1..31d01b6246 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -305,7 +305,7 @@ extern "C" {
#define SSL_TXT_ALL "ALL"
-/*
+/*-
* COMPLEMENTOF* definitions. These identifiers are used to (de-select)
* ciphers normally not being used.
* Example: "RC4" will activate all ciphers using RC4 including ciphers
@@ -453,7 +453,8 @@ struct ssl_method_st
long (*ssl_ctx_callback_ctrl)(SSL_CTX *s, int cb_id, void (*fp)(void));
};
-/* Lets make this into an ASN.1 type structure as follows
+/*-
+ * Lets make this into an ASN.1 type structure as follows
* SSL_SESSION_ID ::= SEQUENCE {
* version INTEGER, -- structure version number
* SSLversion INTEGER, -- SSL version number
@@ -1086,14 +1087,16 @@ struct ssl_ctx_st
/* ALPN information
* (we are in the process of transitioning from NPN to ALPN.) */
- /* For a server, this contains a callback function that allows the
+ /*-
+ * For a server, this contains a callback function that allows the
* server to select the protocol for the connection.
* out: on successful return, this must point to the raw protocol
* name (without the length prefix).
* outlen: on successful return, this contains the length of |*out|.
* in: points to the client's list of supported protocols in
* wire-format.
- * inlen: the length of |in|. */
+ * inlen: the length of |in|.
+ */
int (*alpn_select_cb)(SSL *s,
const unsigned char **out,
unsigned char *outlen,