OpenBSD CVS

CVS log for src/usr.bin/ssh/ssh-pkcs11-helper.c


[BACK] Up to [local] / src / usr.bin / ssh

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.26 / (download) - annotate - [select for diffs], Thu Nov 18 03:31:44 2021 UTC (2 years, 5 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, HEAD
Changes since 1.25: +2 -2 lines
Diff to previous 1.25 (colored)

check for POLLHUP wherever we check for POLLIN

Revision 1.25 / (download) - annotate - [select for diffs], Wed Aug 11 05:20:17 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.24: +3 -2 lines
Diff to previous 1.24 (colored)

remove a bunch of %p in format strings; leftovers of debuggings
past. prompted by Michael Forney, ok dtucker@

Revision 1.24 / (download) - annotate - [select for diffs], Sun Oct 18 11:32:02 2020 UTC (3 years, 6 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_9
Changes since 1.23: +31 -41 lines
Diff to previous 1.23 (colored)

use the new variant log macros instead of prepending __func__ and
appending ssh_err(r) manually; ok markus@

Revision 1.23 / (download) - annotate - [select for diffs], Fri Mar 6 18:26:21 2020 UTC (4 years, 2 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.22: +2 -8 lines
Diff to previous 1.22 (colored)

remove unused variables in ssh-pkcs11-helper; ok djm

Revision 1.22 / (download) - annotate - [select for diffs], Sat Jan 25 00:03:36 2020 UTC (4 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.21: +13 -8 lines
Diff to previous 1.21 (colored)

expose PKCS#11 key labels/X.509 subjects as comments

Extract the key label or X.509 subject string when PKCS#11 keys
are retrieved from the token and plumb this through to places where
it may be used as a comment.

based on https://github.com/openssh/openssh-portable/pull/138
by Danielle Church

feedback and ok markus@

Revision 1.21 / (download) - annotate - [select for diffs], Fri Sep 6 05:23:55 2019 UTC (4 years, 8 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.20: +18 -1 lines
Diff to previous 1.20 (colored)

fixes for !WITH_OPENSSL compilation; ok dtucker@

Revision 1.20 / (download) - annotate - [select for diffs], Fri Sep 6 04:53:27 2019 UTC (4 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.19: +2 -1 lines
Diff to previous 1.19 (colored)

lots of things were relying on libcrypto headers to transitively
include various system headers (mostly stdlib.h); include them
explicitly

Revision 1.19 / (download) - annotate - [select for diffs], Thu Jun 6 05:13:13 2019 UTC (4 years, 11 months ago) by otto
Branch: MAIN
Changes since 1.18: +1 -2 lines
Diff to previous 1.18 (colored)

Replace calls to ssh_malloc_init() by a static init of malloc_options.
Prepares for changes in the way malloc is initialized.  ok guenther@ dtucker@

Revision 1.18 / (download) - annotate - [select for diffs], Thu May 16 08:47:27 2019 UTC (5 years ago) by dtucker
Branch: MAIN
Changes since 1.17: +3 -3 lines
Diff to previous 1.17 (colored)

Move a variable declaration to the block where it's used to make things
a little tidier for -portable.

Revision 1.17 / (download) - annotate - [select for diffs], Wed Jan 23 02:01:10 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.16: +19 -22 lines
Diff to previous 1.16 (colored)

switch mainloop from select(2) to poll(2); ok deraadt@

Revision 1.16 / (download) - annotate - [select for diffs], Mon Jan 21 12:53:35 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.15: +21 -3 lines
Diff to previous 1.15 (colored)

add "-v" flags to ssh-add and ssh-pkcs11-helper to turn up debug
verbosity.

Make ssh-agent turn on ssh-pkcs11-helper's verbosity when it is run
in debug mode ("ssh-agent -d"), so we get to see errors from the
PKCS#11 code.

ok markus@

Revision 1.15 / (download) - annotate - [select for diffs], Sun Jan 20 22:51:37 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.14: +30 -10 lines
Diff to previous 1.14 (colored)

add support for ECDSA keys in PKCS#11 tokens

Work by markus@ and Pedro Martelletto, feedback and ok me@

Revision 1.14 / (download) - annotate - [select for diffs], Mon Jan 8 15:18:46 2018 UTC (6 years, 4 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.13: +104 -77 lines
Diff to previous 1.13 (colored)

switch ssh-pkcs11-helper to new API; ok djm@

Revision 1.13 / (download) - annotate - [select for diffs], Tue May 30 08:52:19 2017 UTC (6 years, 11 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.12: +7 -7 lines
Diff to previous 1.12 (colored)

switch from Key typedef with struct sshkey; ok djm@

Revision 1.12 / (download) - annotate - [select for diffs], Mon Feb 15 09:47:49 2016 UTC (8 years, 3 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.11: +2 -1 lines
Diff to previous 1.11 (colored)

Add a function to enable security-related malloc_options.  With and ok
deraadt@, something similar has been in the snaps for a while.

Revision 1.11 / (download) - annotate - [select for diffs], Thu Aug 20 22:32:42 2015 UTC (8 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.10: +3 -3 lines
Diff to previous 1.10 (colored)

Do not cast result of malloc/calloc/realloc* if stdlib.h is in scope
ok krw millert

Revision 1.10 / (download) - annotate - [select for diffs], Tue Jan 20 23:14:00 2015 UTC (9 years, 3 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.9: +1 -2 lines
Diff to previous 1.9 (colored)

Reduce use of <sys/param.h> and transition to <limits.h> throughout.
ok djm markus

Revision 1.9 / (download) - annotate - [select for diffs], Thu Dec 11 08:20:09 2014 UTC (9 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.8: +3 -2 lines
Diff to previous 1.8 (colored)

explicitly include sys/param.h in files that use the howmany() macro;
from portable

Revision 1.8 / (download) - annotate - [select for diffs], Tue Jun 24 01:13:21 2014 UTC (9 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.7: +6 -2 lines
Diff to previous 1.7 (colored)

New key API: refactor key-related functions to be more library-like,
existing API is offered as a set of wrappers.

with and ok markus@

Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
Dempsky and Ron Bowes for a detailed review a few months ago.

Revision 1.7 / (download) - annotate - [select for diffs], Mon Dec 2 02:56:17 2013 UTC (10 years, 5 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.6: +3 -2 lines
Diff to previous 1.6 (colored)

use-after-free; bz#2175 patch from Loganaden Velvindron @ AfriNIC

Revision 1.6 / (download) - annotate - [select for diffs], Fri May 17 00:13:14 2013 UTC (11 years ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.5: +11 -12 lines
Diff to previous 1.5 (colored)

bye, bye xfree(); ok markus@

Revision 1.5 / (download) - annotate - [select for diffs], Fri May 10 10:13:50 2013 UTC (11 years ago) by dtucker
Branch: MAIN
Changes since 1.4: +1 -2 lines
Diff to previous 1.4 (colored)

remove unused extern optarg.  ok markus@

Revision 1.4 / (download) - annotate - [select for diffs], Mon Jul 2 12:13:26 2012 UTC (11 years, 10 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.3: +3 -3 lines
Diff to previous 1.3 (colored)

fix a couple of "assigned but not used" warnings.  ok markus@

Revision 1.3 / (download) - annotate - [select for diffs], Wed Feb 24 06:12:53 2010 UTC (14 years, 2 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.2: +1 -0 lines
Diff to previous 1.2 (colored)

Add $OpenBSD$ tags in comments, our portable-syncing scripts use these

Revision 1.2 / (download) - annotate - [select for diffs], Fri Feb 19 18:01:08 2010 UTC (14 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.1: +2 -3 lines
Diff to previous 1.1 (colored)

gcc2 requires decls before code

Revision 1.1 / (download) - annotate - [select for diffs], Mon Feb 8 10:50:20 2010 UTC (14 years, 3 months ago) by markus
Branch: MAIN

replace our obsolete smartcard code with PKCS#11.
	ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs-11v2-20.pdf
ssh(1) and ssh-keygen(1) use dlopen(3) directly to talk to a PKCS#11
provider (shared library) while ssh-agent(1) delegates PKCS#11 to
a forked a ssh-pkcs11-helper process.
PKCS#11 is currently a compile time option.
feedback and ok djm@; inspired by patches from Alon Bar-Lev

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.