mirror of
https://github.com/openssl/openssl.git
synced 2025-03-25 20:00:44 +08:00
Correct some badly formated preprocessor lines
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3304)
This commit is contained in:
parent
a5eef31e25
commit
d88ab353d3
@ -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) {
|
||||
|
@ -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.
|
||||
|
@ -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"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user