diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2019-08-05 19:11:07 +0200 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2019-08-13 11:40:55 +0200 |
| commit | 7f616a00e9232392927099dca1eca70d0d058665 (patch) | |
| tree | c68bbc5b6370a9ee100bb69718608b955a07d772 /crypto | |
| parent | 23ccf13dd68e75ba6cabbcaaeaff21d22aacb7d0 (diff) | |
BIO_lookup_ex: Always retry the lookup on failure with AI_NUMERICHOST set
Do not try to discern the error return value on
getaddrinfo() failure but when retrying set the AI_NUMERICHOST
to avoid DNS lookups.
Fixes: #9053
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9535)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/bio/b_addr.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c index 47366332ac..511d9c197b 100644 --- a/crypto/bio/b_addr.c +++ b/crypto/bio/b_addr.c @@ -709,20 +709,14 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type, case 0: ret = 1; /* Success */ break; -# if (defined(EAI_FAMILY) || defined(EAI_ADDRFAMILY)) && defined(AI_ADDRCONFIG) -# ifdef EAI_FAMILY - case EAI_FAMILY: -# endif -# ifdef EAI_ADDRFAMILY - case EAI_ADDRFAMILY: -# endif + default: +# if defined(AI_ADDRCONFIG) && defined(AI_NUMERICHOST) if (hints.ai_flags & AI_ADDRCONFIG) { hints.ai_flags &= ~AI_ADDRCONFIG; + hints.ai_flags |= AI_NUMERICHOST; goto retry; } # endif - /* fall through */ - default: BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_SYS_LIB); ERR_add_error_data(1, gai_strerror(gai_ret)); break; |