diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-07-14 23:57:01 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-07-15 15:08:10 +1000 |
commit | aaa8b609a7b332be836cd9a3b782422254972777 (patch) | |
tree | cb4167b3f06a11410d6b82976ddb375ed626abdc /ssh.h | |
parent | 6368022cd4dd508671c4999a59ec5826df098530 (diff) |
upstream: allow some additional control over the use of ssh-askpass
via $SSH_ASKPASS_REQUIRE, including force-enable/disable. bz#69 ok markus@
OpenBSD-Commit-ID: 3a1e6cbbf6241ddc4405c4246caa2c249f149eb2
Diffstat (limited to 'ssh.h')
-rw-r--r-- | ssh.h | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.h,v 1.89 2018/12/27 03:25:25 djm Exp $ */ | 1 | /* $OpenBSD: ssh.h,v 1.90 2020/07/14 23:57:01 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -68,6 +68,11 @@ | |||
68 | #define SSH_ASKPASS_ENV "SSH_ASKPASS" | 68 | #define SSH_ASKPASS_ENV "SSH_ASKPASS" |
69 | 69 | ||
70 | /* | 70 | /* |
71 | * Environment variable to control whether or not askpass is used. | ||
72 | */ | ||
73 | #define SSH_ASKPASS_REQUIRE_ENV "SSH_ASKPASS_REQUIRE" | ||
74 | |||
75 | /* | ||
71 | * Force host key length and server key length to differ by at least this | 76 | * Force host key length and server key length to differ by at least this |
72 | * many bits. This is to make double encryption with rsaref work. | 77 | * many bits. This is to make double encryption with rsaref work. |
73 | */ | 78 | */ |