libssh: correct libssh src file list

[emaste]

Summary

Link against the ssh-sk-helper client rather than the sk internal implementation.

PR: 258384
Fixes: f448c3ed4ae1 ("openssh: Add new source files to libssl")
Fixes: 19261079b743 ("openssh: update to OpenSSH v8.7p1")
Sponsored by: The FreeBSD Foundation

Test Plan

Ad-hoc tested via login(1) with pam_ssh.so in /etc/pam.d/login. @madpilot (PR reporter) is going to confirm.

[madpilot]

I tried this right now but it fails to build for me:

===> sbin/geom (includes)                                                                                               
--- includes_subdir_secure ---                                                                                          
--- includes_subdir_secure/libexec/ssh-sk-helper ---                                                                    
make[5]: "/poudriere/jails/14amd64/usr/src/share/mk/src.libnames.mk" line 723: /poudriere/jails/14amd64/usr/src/secure/l
ibexec/ssh-sk-helper: Invalid LIBADD used which may need to be added to src.libnames.mk: fido2                          
                                                                                                                        
make[5]: stopped in /poudriere/jails/14amd64/usr/src/secure/libexec/ssh-sk-helper

Maybe I misapplied it?

[des]

crypto/openssh/config.h

140

Isn't this the opposite of what you want?

[emaste]

Oops I seem to have uploaded the wrong diff here.
D32509 should be adding U2F key support.
This one should be a small patch to libssh/Makefile.

[emaste]

Upload correct diff

[emaste]

In D32529#733966, @madpilot wrote:

Maybe I misapplied it?

Sorry I wasn't clear - D32448 adds libfido2 and is also needed as a dependency for D32509.

To test everything you'll need:

• D32529 (this change)
• D32448 (add libfido2)
• D32509 (add ssh-sk-helper and enable)

[madpilot]

@emaste Thanks for explaining.

Then regarding this single change here I have tested it and see no regression.