[Bug 2319] [PATCH REVIEW] U2F authentication

[bugzilla-daemon at bugzilla.mindrot.org]

https://bugzilla.mindrot.org/show_bug.cgi?id=2319

mmotz at e-motz.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |mmotz at e-motz.com

--- Comment #17 from mmotz at e-motz.com ---
A couple of things to mention here, the patch has failed in two
different files, which I manually patched,

patching file readconf.c
Hunk #1 succeeded at 150 (offset 1 line).
Hunk #2 succeeded at 199 (offset 1 line).
Hunk #3 succeeded at 927 (offset 29 lines).
Hunk #4 succeeded at 1673 (offset 52 lines).
Hunk #5 FAILED at 1851.
Hunk #6 succeeded at 2345 (offset 55 lines).
1 out of 6 hunks FAILED -- saving rejects to file readconf.c.rej

readconf.c.rej:
--- readconf.c
+++ readconf.c
@@ -1851,6 +1869,10 @@ fill_default_options(Options * options)
                options->tun_remote = SSH_TUNID_ANY;
        if (options->permit_local_command == -1)
                options->permit_local_command = 0;
+       if (options->u2f_authentication == -1)
+               options->u2f_authentication = 1;
+       if (options->u2f_mode == NULL)
+               options->u2f_mode = strdup("authentication");
        if (options->use_roaming == -1)
                options->use_roaming = 1;
        if (options->visual_host_key == -1)





patching file sshkey.c
Hunk #3 FAILED at 117.
Hunk #4 succeeded at 515 (offset -3 lines).
Hunk #5 succeeded at 797 (offset -3 lines).
Hunk #6 succeeded at 1276 (offset -4 lines).
Hunk #7 succeeded at 2016 (offset -3 lines).
Hunk #8 succeeded at 2158 (offset -3 lines).
Hunk #9 succeeded at 2212 (offset -3 lines).
1 out of 9 hunks FAILED -- saving rejects to file sshkey.c.rej

sshkey.c.rej:
--- sshkey.c
+++ sshkey.c
@@ -117,6 +122,7 @@ static const struct keytype keytypes[] = {
 #  endif /* OPENSSL_HAS_NISTP521 */
 # endif /* OPENSSL_HAS_ECC */
 #endif /* WITH_OPENSSL */
+       { "ssh-u2f", "U2F", KEY_U2F, 0, 0 },
        { NULL, NULL, -1, -1, 0 }
 };



 and while trying to make openssh the following errors are produced and
am unable to solve

qr at vpn:~/openssh $ make
(cd openbsd-compat && make)
make[1]: Entering directory '/home/qr/openssh/openbsd-compat'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/home/qr/openssh/openbsd-compat'
gcc -g -O2 -Wall -Wpointer-arith -Wuninitialized -Wsign-compare
-Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign
-Wno-unused-result -fno-strict-aliasing -D_FORTIFY_SOURCE=2 -ftrapv
-fno-builtin-memset -fstack-protector-strong -fPIE  -I. -I. 
-I/usr/local/include/u2f-host  -DSSHDIR=\"/usr/local/etc\"
-D_PATH_SSH_PROGRAM=\"/usr/local/bin/ssh\"
-D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/local/libexec/ssh-askpass\"
-D_PATH_SFTP_SERVER=\"/usr/local/libexec/sftp-server\"
-D_PATH_SSH_KEY_SIGN=\"/usr/local/libexec/ssh-keysign\"
-D_PATH_SSH_PKCS11_HELPER=\"/usr/local/libexec/ssh-pkcs11-helper\"
-D_PATH_SSH_PIDDIR=\"/var/run\"
-D_PATH_PRIVSEP_CHROOT_DIR=\"/var/empty\" -DHAVE_CONFIG_H -c sshkey.c
-o sshkey.o
sshkey.c:65:17: fatal error: u2f.h: No such file or directory
 #include "u2f.h"
                 ^
compilation terminated.
Makefile:155: recipe for target 'sshkey.o' failed
make: *** [sshkey.o] Error 1

-- 
You are receiving this mail because:
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.