diff options
| author | Pauli <paul.dale@oracle.com> | 2020-01-16 13:17:25 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-01-25 09:30:58 +1000 |
| commit | f6edde4f06d2cadaf0949399e5df0b6f6a5b3598 (patch) | |
| tree | 0488de1a25e1681fcde616151460ad4ab48c9e9c | |
| parent | 8f21260b09eca6226255763e1856c12fbc71985c (diff) | |
| download | openssl-f6edde4f06d2cadaf0949399e5df0b6f6a5b3598.zip openssl-f6edde4f06d2cadaf0949399e5df0b6f6a5b3598.tar.gz openssl-f6edde4f06d2cadaf0949399e5df0b6f6a5b3598.tar.bz2 | |
des: fix header file preprocessor indentation
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10858)
| -rw-r--r-- | include/openssl/des.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/include/openssl/des.h b/include/openssl/des.h index 6bbf582..1ca9436 100644 --- a/include/openssl/des.h +++ b/include/openssl/des.h @@ -19,17 +19,17 @@ # include <openssl/opensslconf.h> # ifndef OPENSSL_NO_DES -# ifdef __cplusplus +# ifdef __cplusplus extern "C" { -# endif -# include <openssl/e_os2.h> +# endif +# include <openssl/e_os2.h> typedef unsigned int DES_LONG; -# ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -# endif +# ifdef OPENSSL_BUILD_SHLIBCRYPTO +# undef OPENSSL_EXTERN +# define OPENSSL_EXTERN OPENSSL_EXPORT +# endif typedef unsigned char DES_cblock[8]; typedef /* const */ unsigned char const_DES_cblock[8]; @@ -48,25 +48,25 @@ typedef struct DES_ks { } ks[16]; } DES_key_schedule; -# define DES_KEY_SZ (sizeof(DES_cblock)) -# define DES_SCHEDULE_SZ (sizeof(DES_key_schedule)) +# define DES_KEY_SZ (sizeof(DES_cblock)) +# define DES_SCHEDULE_SZ (sizeof(DES_key_schedule)) -# define DES_ENCRYPT 1 -# define DES_DECRYPT 0 +# define DES_ENCRYPT 1 +# define DES_DECRYPT 0 -# define DES_CBC_MODE 0 -# define DES_PCBC_MODE 1 +# define DES_CBC_MODE 0 +# define DES_PCBC_MODE 1 -# define DES_ecb2_encrypt(i,o,k1,k2,e) \ +# define DES_ecb2_encrypt(i,o,k1,k2,e) \ DES_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e)) -# define DES_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \ +# define DES_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \ DES_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e)) -# define DES_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \ +# define DES_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \ DES_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e)) -# define DES_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \ +# define DES_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \ DES_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n)) const char *DES_options(void); @@ -166,11 +166,11 @@ void DES_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, DES_key_schedule *schedule, DES_cblock *ivec, int *num); -# define DES_fixup_key_parity DES_set_odd_parity +# define DES_fixup_key_parity DES_set_odd_parity -# ifdef __cplusplus +# ifdef __cplusplus } -# endif +# endif # endif #endif |