diff options
| author | tb <> | 2021-11-30 18:27:04 +0000 |
|---|---|---|
| committer | tb <> | 2021-11-30 18:27:04 +0000 |
| commit | 2cd44935139d109307adc803d2ac0a0db4341524 (patch) | |
| tree | cadaa19acdd73835998dd1a703fbc544092359d9 | |
| parent | 1cc1c6803e5930d767178947d69dfa9e3d8a567b (diff) | |
| download | openbsd-2cd44935139d109307adc803d2ac0a0db4341524.tar.gz openbsd-2cd44935139d109307adc803d2ac0a0db4341524.tar.bz2 openbsd-2cd44935139d109307adc803d2ac0a0db4341524.zip | |
Fix some annoying whitespace inconsistencies.
| -rw-r--r-- | src/lib/libcrypto/evp/evp.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index c142b58a38..9898738e64 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp.h,v 1.86 2021/11/30 18:20:06 tb Exp $ */ | 1 | /* $OpenBSD: evp.h,v 1.87 2021/11/30 18:27:04 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 | * |
| @@ -327,23 +327,23 @@ struct evp_cipher_st { | |||
| 327 | #define EVP_CIPH_CCM_MODE 0x7 | 327 | #define EVP_CIPH_CCM_MODE 0x7 |
| 328 | #define EVP_CIPH_XTS_MODE 0x10001 | 328 | #define EVP_CIPH_XTS_MODE 0x10001 |
| 329 | #define EVP_CIPH_WRAP_MODE 0x10002 | 329 | #define EVP_CIPH_WRAP_MODE 0x10002 |
| 330 | #define EVP_CIPH_MODE 0xF0007 | 330 | #define EVP_CIPH_MODE 0xF0007 |
| 331 | /* Set if variable length cipher */ | 331 | /* Set if variable length cipher */ |
| 332 | #define EVP_CIPH_VARIABLE_LENGTH 0x8 | 332 | #define EVP_CIPH_VARIABLE_LENGTH 0x8 |
| 333 | /* Set if the iv handling should be done by the cipher itself */ | 333 | /* Set if the iv handling should be done by the cipher itself */ |
| 334 | #define EVP_CIPH_CUSTOM_IV 0x10 | 334 | #define EVP_CIPH_CUSTOM_IV 0x10 |
| 335 | /* Set if the cipher's init() function should be called if key is NULL */ | 335 | /* Set if the cipher's init() function should be called if key is NULL */ |
| 336 | #define EVP_CIPH_ALWAYS_CALL_INIT 0x20 | 336 | #define EVP_CIPH_ALWAYS_CALL_INIT 0x20 |
| 337 | /* Call ctrl() to init cipher parameters */ | 337 | /* Call ctrl() to init cipher parameters */ |
| 338 | #define EVP_CIPH_CTRL_INIT 0x40 | 338 | #define EVP_CIPH_CTRL_INIT 0x40 |
| 339 | /* Don't use standard key length function */ | 339 | /* Don't use standard key length function */ |
| 340 | #define EVP_CIPH_CUSTOM_KEY_LENGTH 0x80 | 340 | #define EVP_CIPH_CUSTOM_KEY_LENGTH 0x80 |
| 341 | /* Don't use standard block padding */ | 341 | /* Don't use standard block padding */ |
| 342 | #define EVP_CIPH_NO_PADDING 0x100 | 342 | #define EVP_CIPH_NO_PADDING 0x100 |
| 343 | /* cipher handles random key generation */ | 343 | /* cipher handles random key generation */ |
| 344 | #define EVP_CIPH_RAND_KEY 0x200 | 344 | #define EVP_CIPH_RAND_KEY 0x200 |
| 345 | /* cipher has its own additional copying logic */ | 345 | /* cipher has its own additional copying logic */ |
| 346 | #define EVP_CIPH_CUSTOM_COPY 0x400 | 346 | #define EVP_CIPH_CUSTOM_COPY 0x400 |
| 347 | /* Allow use default ASN1 get/set iv */ | 347 | /* Allow use default ASN1 get/set iv */ |
| 348 | #define EVP_CIPH_FLAG_DEFAULT_ASN1 0x1000 | 348 | #define EVP_CIPH_FLAG_DEFAULT_ASN1 0x1000 |
| 349 | /* Buffer length in bits not bytes: CFB1 mode only */ | 349 | /* Buffer length in bits not bytes: CFB1 mode only */ |
| @@ -355,7 +355,7 @@ struct evp_cipher_st { | |||
| 355 | /* Cipher handles any and all padding logic as well | 355 | /* Cipher handles any and all padding logic as well |
| 356 | * as finalisation. | 356 | * as finalisation. |
| 357 | */ | 357 | */ |
| 358 | #define EVP_CIPH_FLAG_CUSTOM_CIPHER 0x100000 | 358 | #define EVP_CIPH_FLAG_CUSTOM_CIPHER 0x100000 |
| 359 | #define EVP_CIPH_FLAG_AEAD_CIPHER 0x200000 | 359 | #define EVP_CIPH_FLAG_AEAD_CIPHER 0x200000 |
| 360 | 360 | ||
| 361 | /* | 361 | /* |
| @@ -367,14 +367,14 @@ struct evp_cipher_st { | |||
| 367 | /* ctrl() values */ | 367 | /* ctrl() values */ |
| 368 | 368 | ||
| 369 | #define EVP_CTRL_INIT 0x0 | 369 | #define EVP_CTRL_INIT 0x0 |
| 370 | #define EVP_CTRL_SET_KEY_LENGTH 0x1 | 370 | #define EVP_CTRL_SET_KEY_LENGTH 0x1 |
| 371 | #define EVP_CTRL_GET_RC2_KEY_BITS 0x2 | 371 | #define EVP_CTRL_GET_RC2_KEY_BITS 0x2 |
| 372 | #define EVP_CTRL_SET_RC2_KEY_BITS 0x3 | 372 | #define EVP_CTRL_SET_RC2_KEY_BITS 0x3 |
| 373 | #define EVP_CTRL_GET_RC5_ROUNDS 0x4 | 373 | #define EVP_CTRL_GET_RC5_ROUNDS 0x4 |
| 374 | #define EVP_CTRL_SET_RC5_ROUNDS 0x5 | 374 | #define EVP_CTRL_SET_RC5_ROUNDS 0x5 |
| 375 | #define EVP_CTRL_RAND_KEY 0x6 | 375 | #define EVP_CTRL_RAND_KEY 0x6 |
| 376 | #define EVP_CTRL_PBE_PRF_NID 0x7 | 376 | #define EVP_CTRL_PBE_PRF_NID 0x7 |
| 377 | #define EVP_CTRL_COPY 0x8 | 377 | #define EVP_CTRL_COPY 0x8 |
| 378 | #define EVP_CTRL_AEAD_SET_IVLEN 0x9 | 378 | #define EVP_CTRL_AEAD_SET_IVLEN 0x9 |
| 379 | #define EVP_CTRL_AEAD_GET_TAG 0x10 | 379 | #define EVP_CTRL_AEAD_GET_TAG 0x10 |
| 380 | #define EVP_CTRL_AEAD_SET_TAG 0x11 | 380 | #define EVP_CTRL_AEAD_SET_TAG 0x11 |
| @@ -1117,7 +1117,7 @@ void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, | |||
| 1117 | #define EVP_PKEY_CTRL_DIGESTINIT 7 | 1117 | #define EVP_PKEY_CTRL_DIGESTINIT 7 |
| 1118 | 1118 | ||
| 1119 | /* Used by GOST key encryption in TLS */ | 1119 | /* Used by GOST key encryption in TLS */ |
| 1120 | #define EVP_PKEY_CTRL_SET_IV 8 | 1120 | #define EVP_PKEY_CTRL_SET_IV 8 |
| 1121 | 1121 | ||
| 1122 | #define EVP_PKEY_CTRL_CMS_ENCRYPT 9 | 1122 | #define EVP_PKEY_CTRL_CMS_ENCRYPT 9 |
| 1123 | #define EVP_PKEY_CTRL_CMS_DECRYPT 10 | 1123 | #define EVP_PKEY_CTRL_CMS_DECRYPT 10 |