[Bug 2472] Add support to load additional certificates

[bugzilla-daemon at bugzilla.mindrot.org]

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

--- Comment #11 from Peter <peter at pean.org> ---
Hi Thomas,

Thank you for your work, this seems to be exactly what Im looking for.
I have my keys on a PCKS#11 provider and need to use the agent to
forward my certificates. 

I tried to add these patches to 7.6p1 but it fails:



[tl2:~/openssh-7.6p1] petera$ patch < 20
2017-01-30-0001-sshkey-API-Add-new-sshkey_is_private-function.patch    
   
2017-01-30-0002-ssh-agent-Add-support-to-load-additional-certificate.patch
 2017-01-30-0003-ssh-add-Support-adding-an-additional-certificate.patch 
[tl2:~/openssh-7.6p1] petera$ patch <
2017-01-30-0002-ssh-agent-Add-support-to-load-additional-certificate.patch 
patching file ssh-agent.c
Hunk #1 succeeded at 114 (offset 5 lines).
Hunk #2 succeeded at 187 with fuzz 2 (offset -7 lines).
Hunk #3 FAILED at 238.
Hunk #4 succeeded at 243 (offset -8 lines).
Hunk #5 FAILED at 289.
Hunk #6 FAILED at 304.
Hunk #7 FAILED at 360.
Hunk #8 FAILED at 425.
Hunk #9 succeeded at 332 (offset -116 lines).
Hunk #10 FAILED at 693.
Hunk #11 succeeded at 616 with fuzz 2 (offset -220 lines).
6 out of 11 hunks FAILED -- saving rejects to file ssh-agent.c.rej
[tl2:~/openssh-7.6p1] petera$ patch < 20
2017-01-30-0001-sshkey-API-Add-new-sshkey_is_private-function.patch    
   
2017-01-30-0002-ssh-agent-Add-support-to-load-additional-certificate.patch
 2017-01-30-0003-ssh-add-Support-adding-an-additional-certificate.patch 
[tl2:~/openssh-7.6p1] petera$ patch <
2017-01-30-0003-ssh-add-Support-adding-an-additional-certificate.patch 
patching file ssh-add.1
Hunk #1 succeeded at 121 (offset -1 lines).
patching file ssh-add.c
Hunk #1 FAILED at 178.
Hunk #2 FAILED at 440.
Hunk #3 succeeded at 453 (offset -8 lines).
Hunk #4 FAILED at 479.
Hunk #5 FAILED at 508.
Hunk #6 succeeded at 509 (offset -7 lines).
Hunk #7 FAILED at 608.
Hunk #8 FAILED at 617.
6 out of 8 hunks FAILED -- saving rejects to file ssh-add.c.rej

-- 
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.