diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-04-25 15:35:41 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-04-25 15:44:48 +0200 |
| commit | d88ab353d3f94031d56d2d6451695eac305c9738 (patch) | |
| tree | 5b44fa01b0acf182c47f241a3000b73ce3f4ce39 | |
| parent | a5eef31e257bc6267e0973edda18ee2f180ed081 (diff) | |
| download | openssl-d88ab353d3f94031d56d2d6451695eac305c9738.tar.gz | |
Correct some badly formated preprocessor lines
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3304)
| -rw-r--r-- | apps/s_server.c | 10 | ||||
| -rw-r--r-- | crypto/srp/srp_vfy.c | 4 | ||||
| -rw-r--r-- | test/dtlsv1listentest.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index ebf772da07..d842fb8f53 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2125,11 +2125,11 @@ static int sv_body(int s, int stype, int prot, unsigned char *context) struct timeval *timeoutp; #endif #ifndef OPENSSL_NO_DTLS - #ifndef OPENSSL_NO_SCTP +# ifndef OPENSSL_NO_SCTP int isdtls = (stype == SOCK_DGRAM || prot == IPPROTO_SCTP); - #else +# else int isdtls = (stype == SOCK_DGRAM); - #endif +# endif #endif buf = app_malloc(bufsize, "server buffer"); @@ -2163,11 +2163,11 @@ static int sv_body(int s, int stype, int prot, unsigned char *context) } #ifndef OPENSSL_NO_DTLS if (isdtls) { -#ifndef OPENSSL_NO_SCTP +# ifndef OPENSSL_NO_SCTP if (prot == IPPROTO_SCTP) sbio = BIO_new_dgram_sctp(s, BIO_NOCLOSE); else -#endif +# endif sbio = BIO_new_dgram(s, BIO_NOCLOSE); if (enable_timeouts) { diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c index 29b7afcb04..20e4258427 100644 --- a/crypto/srp/srp_vfy.c +++ b/crypto/srp/srp_vfy.c @@ -474,7 +474,7 @@ static SRP_user_pwd *find_user(SRP_VBASE *vb, char *username) return NULL; } - #if OPENSSL_API_COMPAT < 0x10100000L +# if OPENSSL_API_COMPAT < 0x10100000L /* * DEPRECATED: use SRP_VBASE_get1_by_user instead. * This method ignores the configured seed and fails for an unknown user. @@ -485,7 +485,7 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username) { return find_user(vb, username); } -#endif +# endif /* * Ownership of the returned pointer is released to the caller. diff --git a/test/dtlsv1listentest.c b/test/dtlsv1listentest.c index 91d78e1301..dfbc7aebb8 100644 --- a/test/dtlsv1listentest.c +++ b/test/dtlsv1listentest.c @@ -13,7 +13,7 @@ #include <openssl/err.h> #include <openssl/conf.h> #ifndef OPENSSL_NO_ENGINE - #include <openssl/engine.h> +# include <openssl/engine.h> #endif #include "e_os.h" |