tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: allow override of the pkcs#11 helper binary via 

$SSH_PKCS11_HELPER; needed for regress tests.

work by markus@, ok me

OpenBSD-Commit-ID: f78d8185500bd7c37aeaf7bd27336db62f0f7a83
This commit is contained in:
djm@openbsd.org 2019-01-20 22:54:30 +00:00 committed by Damien Miller
parent 93f02107f4
commit 854bd8674e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ssh-pkcs11-client.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-pkcs11-client.c,v 1.12 2019/01/20 22:51:37 djm Exp $ */ /* $OpenBSD: ssh-pkcs11-client.c,v 1.13 2019/01/20 22:54:30 djm Exp $ */
/* /*
* Copyright (c) 2010 Markus Friedl. All rights reserved. * Copyright (c) 2010 Markus Friedl. All rights reserved.
* Copyright (c) 2014 Pedro Martelletto. All rights reserved. * Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@ -245,6 +245,7 @@ static int
pkcs11_start_helper(void) pkcs11_start_helper(void)
{ {
int pair[2]; int pair[2];
char *helper;
if (pkcs11_start_helper_methods() == -1) { if (pkcs11_start_helper_methods() == -1) {
error("pkcs11_start_helper_methods failed"); error("pkcs11_start_helper_methods failed");
@ -266,10 +267,11 @@ pkcs11_start_helper(void)
} }
close(pair[0]); close(pair[0]);
close(pair[1]); close(pair[1]);
execlp(_PATH_SSH_PKCS11_HELPER, _PATH_SSH_PKCS11_HELPER, helper = getenv("SSH_PKCS11_HELPER");
(char *)NULL); if (helper == NULL || strlen(helper) == 0)
fprintf(stderr, "exec: %s: %s\n", _PATH_SSH_PKCS11_HELPER, helper = _PATH_SSH_PKCS11_HELPER;
strerror(errno)); execlp(helper, helper, (char *)NULL);
fprintf(stderr, "exec: %s: %s\n", helper, strerror(errno));
_exit(1); _exit(1);
} }
close(pair[1]); close(pair[1]);