summaryrefslogtreecommitdiffstats
path: root/ssl/kssl.h
diff options
context:
space:
mode:
authorTim Hudson <tjh@openssl.org>2014-12-28 12:48:40 +1000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:48:44 +0000
commitb558c8d59782dab2809a1530cbbcd9f38785302b (patch)
treea87d3dbc2e91e6afeca572069e7866da31985b11 /ssl/kssl.h
parentba442a7e1ba96d0b189bc627a2a750c928a42d13 (diff)
mark all block comments that need format preserving so that
indent will not alter them when reformatting comments (cherry picked from commit 1d97c8435171a7af575f73c526d79e1ef0ee5960) Conflicts: crypto/bn/bn_lcl.h crypto/bn/bn_prime.c crypto/engine/eng_all.c crypto/rc4/rc4_utl.c crypto/sha/sha.h ssl/kssl.c ssl/t1_lib.c Conflicts: crypto/rc4/rc4_enc.c crypto/x509v3/v3_scts.c crypto/x509v3/v3nametest.c ssl/d1_both.c ssl/s3_srvr.c ssl/ssl.h ssl/ssl_locl.h ssl/ssltest.c ssl/t1_lib.c Conflicts: crypto/asn1/a_sign.c crypto/bn/bn_div.c crypto/dsa/dsa_asn1.c crypto/ec/ecp_nistp224.c crypto/ec/ecp_nistp256.c crypto/ec/ecp_nistp521.c crypto/ec/ecp_nistputil.c crypto/modes/gcm128.c crypto/opensslv.h ssl/d1_both.c ssl/heartbeat_test.c ssl/s3_clnt.c ssl/s3_srvr.c ssl/ssl_sess.c ssl/t1_lib.c test/testutil.h Conflicts: apps/openssl.c apps/ts.c apps/vms_decc_init.c crypto/aes/aes_core.c crypto/aes/aes_x86core.c crypto/dsa/dsa_ameth.c crypto/ec/ec2_mult.c crypto/evp/evp.h crypto/objects/objects.h crypto/rsa/rsa_pss.c crypto/stack/safestack.h crypto/ts/ts.h crypto/ts/ts_rsp_verify.c crypto/whrlpool/wp_dgst.c crypto/x509v3/v3_ncons.c e_os2.h engines/ccgost/gost89.c engines/ccgost/gost_ctl.c engines/ccgost/gost_keywrap.c engines/ccgost/gost_keywrap.h engines/ccgost/gost_sign.c ssl/kssl.c ssl/s3_srvr.c Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/kssl.h')
-rw-r--r--ssl/kssl.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/ssl/kssl.h b/ssl/kssl.h
index a3d20e1ccb..c7e16a5a95 100644
--- a/ssl/kssl.h
+++ b/ssl/kssl.h
@@ -76,9 +76,9 @@ extern "C" {
#endif
/*
-** Depending on which KRB5 implementation used, some types from
-** the other may be missing. Resolve that here and now
-*/
+ * Depending on which KRB5 implementation used, some types from
+ * the other may be missing. Resolve that here and now
+ */
#ifdef KRB5_HEIMDAL
typedef unsigned char krb5_octet;
#define FAR
@@ -91,10 +91,10 @@ typedef unsigned char krb5_octet;
#endif
/* Uncomment this to debug kssl problems or
-** to trace usage of the Kerberos session key
-**
-** #define KSSL_DEBUG
-*/
+ * to trace usage of the Kerberos session key
+ *
+ * #define KSSL_DEBUG
+ */
#ifndef KRB5SVC
#define KRB5SVC "host"
@@ -123,10 +123,10 @@ typedef struct kssl_err_st {
} KSSL_ERR;
-/* Context for passing
-** (1) Kerberos session key to SSL, and
-** (2) Config data between application and SSL lib
-*/
+/*- Context for passing
+ * (1) Kerberos session key to SSL, and
+ * (2) Config data between application and SSL lib
+ */
typedef struct kssl_ctx_st
{
/* used by: disposition: */