diff options
| author | Damien Miller <djm@mindrot.org> | 2003-06-28 10:08:16 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2003-06-28 10:08:16 +0200 |
| commit | 723569b257c8b1f48836ea777886c10bfa844692 (patch) | |
| tree | e8a8a0b8b2d6edd0db64c0837346c63a1b447ed8 | |
| parent | - (djm) Bug #591: use PKCS#15 private key label as a comment in case (diff) | |
| download | openssh-723569b257c8b1f48836ea777886c10bfa844692.tar.xz openssh-723569b257c8b1f48836ea777886c10bfa844692.zip | |
- (djm) Bug #593: Sanity check OpenSC card reader number; patch from
aj@dungeon.inka.de
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | scard-opensc.c | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -1,6 +1,8 @@ 20030628 - (djm) Bug #591: use PKCS#15 private key label as a comment in case of OpenSC. Report and patch from larsch@trustcenter.de + - (djm) Bug #593: Sanity check OpenSC card reader number; patch from + aj@dungeon.inka.de 20030628 - (dtucker) OpenBSD CVS Sync @@ -607,4 +609,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2830 2003/06/28 08:02:47 djm Exp $ +$Id: ChangeLog,v 1.2831 2003/06/28 08:08:16 djm Exp $ diff --git a/scard-opensc.c b/scard-opensc.c index e8e12dd85..4ab87ea8a 100644 --- a/scard-opensc.c +++ b/scard-opensc.c @@ -89,6 +89,12 @@ sc_init(void) r = sc_establish_context(&ctx, "openssh"); if (r) goto err; + if (sc_reader_id >= ctx->reader_count) { + r = SC_ERROR_NO_READERS_FOUND; + error("Illegal reader number %d (max %d)", sc_reader_id, + ctx->reader_count -1); + goto err; + } r = sc_connect_card(ctx->reader[sc_reader_id], 0, &card); if (r) goto err; |