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

- markus@cvs.openbsd.org 2001/09/19 13:23:29 

[key.c]
     key_read() now returns -1 on type mismatch, too
This commit is contained in:
Ben Lindstrom 2001-09-20 00:55:53 +00:00
parent 20daef753d
commit 309f3d1d9c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,9 @@
- markus@cvs.openbsd.org 2001/09/19 10:08:51 - markus@cvs.openbsd.org 2001/09/19 10:08:51
[sshd.8] [sshd.8]
command=xxx applies to subsystem now, too command=xxx applies to subsystem now, too
- markus@cvs.openbsd.org 2001/09/19 13:23:29
[key.c]
key_read() now returns -1 on type mismatch, too
20010918 20010918
- (djm) Configure support for smartcards. Based on Ben's work. - (djm) Configure support for smartcards. Based on Ben's work.
@ -6510,4 +6513,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1542 2001/09/20 00:54:01 mouring Exp $ $Id: ChangeLog,v 1.1543 2001/09/20 00:55:53 mouring Exp $

6
key.c
View File

@ -32,7 +32,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: key.c,v 1.31 2001/09/17 20:50:22 markus Exp $"); RCSID("$OpenBSD: key.c,v 1.32 2001/09/19 13:23:29 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
@ -358,7 +358,7 @@ write_bignum(FILE *f, BIGNUM *num)
return 1; return 1;
} }
/* returns 1 ok, -1 error, 0 type mismatch */ /* returns 1 ok, -1 error */
int int
key_read(Key *ret, char **cpp) key_read(Key *ret, char **cpp)
{ {
@ -413,7 +413,7 @@ key_read(Key *ret, char **cpp)
} else if (ret->type != type) { } else if (ret->type != type) {
/* is a key, but different type */ /* is a key, but different type */
debug3("key_read: type mismatch"); debug3("key_read: type mismatch");
return 0; return -1;
} }
len = 2*strlen(cp); len = 2*strlen(cp);
blob = xmalloc(len); blob = xmalloc(len);