diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c index 66fb0d2bb..c046e4dbf 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.313 2019/11/13 05:42:26 deraadt Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.314 2019/11/14 21:27:29 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2129,8 +2129,13 @@ fill_default_options(Options * options) | |||
2129 | options->fingerprint_hash = SSH_FP_HASH_DEFAULT; | 2129 | options->fingerprint_hash = SSH_FP_HASH_DEFAULT; |
2130 | if (options->update_hostkeys == -1) | 2130 | if (options->update_hostkeys == -1) |
2131 | options->update_hostkeys = 0; | 2131 | options->update_hostkeys = 0; |
2132 | #ifdef ENABLE_SK_INTERNAL | ||
2133 | if (options->sk_provider == NULL) | ||
2134 | options->sk_provider = xstrdup("internal"); | ||
2135 | #else | ||
2132 | if (options->sk_provider == NULL) | 2136 | if (options->sk_provider == NULL) |
2133 | options->sk_provider = xstrdup("$SSH_SK_PROVIDER"); | 2137 | options->sk_provider = xstrdup("$SSH_SK_PROVIDER"); |
2138 | #endif | ||
2134 | 2139 | ||
2135 | /* Expand KEX name lists */ | 2140 | /* Expand KEX name lists */ |
2136 | all_cipher = cipher_alg_list(',', 0); | 2141 | all_cipher = cipher_alg_list(',', 0); |