summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2022-06-06 08:48:11 +0000
committertb <>2022-06-06 08:48:11 +0000
commit4faa7bcb8fdf86a84b9ed6ea7ab78fa59c33f9df (patch)
treee640f9033c7d5a66effe88f814f444699c52f930 /src/lib
parentc52399f8cc6ad57e12a28dd422f4c353ef5f3949 (diff)
downloadopenbsd-4faa7bcb8fdf86a84b9ed6ea7ab78fa59c33f9df.tar.gz
openbsd-4faa7bcb8fdf86a84b9ed6ea7ab78fa59c33f9df.tar.bz2
openbsd-4faa7bcb8fdf86a84b9ed6ea7ab78fa59c33f9df.zip
Fix spaces before tabs
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/ssl_locl.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 2743d7d3f2..4349932aea 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.389 2022/06/03 13:28:36 tb Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.390 2022/06/06 08:48:11 tb 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 *
@@ -213,10 +213,10 @@ __BEGIN_HIDDEN_DECLS
213 213
214/* Bits for algorithm_auth (server authentication) */ 214/* Bits for algorithm_auth (server authentication) */
215#define SSL_aRSA 0x00000001L /* RSA auth */ 215#define SSL_aRSA 0x00000001L /* RSA auth */
216#define SSL_aDSS 0x00000002L /* DSS auth */ 216#define SSL_aDSS 0x00000002L /* DSS auth */
217#define SSL_aNULL 0x00000004L /* no auth (i.e. use ADH or AECDH) */ 217#define SSL_aNULL 0x00000004L /* no auth (i.e. use ADH or AECDH) */
218#define SSL_aECDSA 0x00000040L /* ECDSA auth*/ 218#define SSL_aECDSA 0x00000040L /* ECDSA auth*/
219#define SSL_aGOST01 0x00000200L /* GOST R 34.10-2001 signature auth */ 219#define SSL_aGOST01 0x00000200L /* GOST R 34.10-2001 signature auth */
220#define SSL_aTLS1_3 0x00000400L /* TLSv1.3 authentication */ 220#define SSL_aTLS1_3 0x00000400L /* TLSv1.3 authentication */
221 221
222/* Bits for algorithm_enc (symmetric encryption) */ 222/* Bits for algorithm_enc (symmetric encryption) */
@@ -234,7 +234,7 @@ __BEGIN_HIDDEN_DECLS
234#define SSL_AES256GCM 0x00000800L 234#define SSL_AES256GCM 0x00000800L
235#define SSL_CHACHA20POLY1305 0x00001000L 235#define SSL_CHACHA20POLY1305 0x00001000L
236 236
237#define SSL_AES (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM) 237#define SSL_AES (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM)
238#define SSL_CAMELLIA (SSL_CAMELLIA128|SSL_CAMELLIA256) 238#define SSL_CAMELLIA (SSL_CAMELLIA128|SSL_CAMELLIA256)
239 239
240 240
@@ -341,7 +341,7 @@ __BEGIN_HIDDEN_DECLS
341#define SSL_MAX_EMPTY_RECORDS 32 341#define SSL_MAX_EMPTY_RECORDS 32
342 342
343/* SSL_kRSA <- RSA_ENC | (RSA_TMP & RSA_SIGN) | 343/* SSL_kRSA <- RSA_ENC | (RSA_TMP & RSA_SIGN) |
344 * <- (EXPORT & (RSA_ENC | RSA_TMP) & RSA_SIGN) 344 * <- (EXPORT & (RSA_ENC | RSA_TMP) & RSA_SIGN)
345 * SSL_kDH <- DH_ENC & (RSA_ENC | RSA_SIGN | DSA_SIGN) 345 * SSL_kDH <- DH_ENC & (RSA_ENC | RSA_SIGN | DSA_SIGN)
346 * SSL_kDHE <- RSA_ENC | RSA_SIGN | DSA_SIGN 346 * SSL_kDHE <- RSA_ENC | RSA_SIGN | DSA_SIGN
347 * SSL_aRSA <- RSA_ENC | RSA_SIGN 347 * SSL_aRSA <- RSA_ENC | RSA_SIGN
@@ -436,11 +436,11 @@ struct ssl_method_st {
436 436
437/* Lets make this into an ASN.1 type structure as follows 437/* Lets make this into an ASN.1 type structure as follows
438 * SSL_SESSION_ID ::= SEQUENCE { 438 * SSL_SESSION_ID ::= SEQUENCE {
439 * version INTEGER, -- structure version number 439 * version INTEGER, -- structure version number
440 * SSLversion INTEGER, -- SSL version number 440 * SSLversion INTEGER, -- SSL version number
441 * Cipher OCTET STRING, -- the 3 byte cipher ID 441 * Cipher OCTET STRING, -- the 3 byte cipher ID
442 * Session_ID OCTET STRING, -- the Session ID 442 * Session_ID OCTET STRING, -- the Session ID
443 * Master_key OCTET STRING, -- the master key 443 * Master_key OCTET STRING, -- the master key
444 * KRB5_principal OCTET STRING -- optional Kerberos principal 444 * KRB5_principal OCTET STRING -- optional Kerberos principal
445 * Time [ 1 ] EXPLICIT INTEGER, -- optional Start Time 445 * Time [ 1 ] EXPLICIT INTEGER, -- optional Start Time
446 * Timeout [ 2 ] EXPLICIT INTEGER, -- optional Timeout ins seconds 446 * Timeout [ 2 ] EXPLICIT INTEGER, -- optional Timeout ins seconds
@@ -1037,7 +1037,7 @@ typedef struct ssl_internal_st {
1037 const SRTP_PROTECTION_PROFILE *srtp_profile; /* What's been chosen */ 1037 const SRTP_PROTECTION_PROFILE *srtp_profile; /* What's been chosen */
1038 1038
1039 int renegotiate;/* 1 if we are renegotiating. 1039 int renegotiate;/* 1 if we are renegotiating.
1040 * 2 if we are a server and are inside a handshake 1040 * 2 if we are a server and are inside a handshake
1041 * (i.e. not just sending a HelloRequest) */ 1041 * (i.e. not just sending a HelloRequest) */
1042 1042
1043 int rstate; /* where we are when reading */ 1043 int rstate; /* where we are when reading */