tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Bug #593: Sanity check OpenSC card reader number; patch from 

aj@dungeon.inka.de
This commit is contained in:
Damien Miller 2003-06-28 18:08:16 +10:00
parent 4a8e284855
commit 723569b257
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,8 @@
20030628 20030628
- (djm) Bug #591: use PKCS#15 private key label as a comment in case - (djm) Bug #591: use PKCS#15 private key label as a comment in case
of OpenSC. Report and patch from larsch@trustcenter.de 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 20030628
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
@ -607,4 +609,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

6
scard-opensc.c
View File

@ -89,6 +89,12 @@ sc_init(void)
r = sc_establish_context(&ctx, "openssh"); r = sc_establish_context(&ctx, "openssh");
if (r) if (r)
goto err; 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); r = sc_connect_card(ctx->reader[sc_reader_id], 0, &card);
if (r) if (r)
goto err; goto err;