summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/key.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2001-09-19 13:23:29 +0000
committermarkus <markus@openbsd.org>2001-09-19 13:23:29 +0000
commit130dd514f792dcaedc4341ad38928867ab9b2cb6 (patch)
tree1e0f82df1f34a8e61f3a97678482a122efe252f9 /usr.bin/ssh/key.c
parentinline some very common putback/chrsave. Worth roughly 10% (diff)
downloadwireguard-openbsd-130dd514f792dcaedc4341ad38928867ab9b2cb6.tar.xz
wireguard-openbsd-130dd514f792dcaedc4341ad38928867ab9b2cb6.zip
key_read() now returns -1 on type mismatch, too
Diffstat (limited to 'usr.bin/ssh/key.c')
-rw-r--r--usr.bin/ssh/key.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/key.c b/usr.bin/ssh/key.c
index b382f36cf2b..5c711b9d797 100644
--- a/usr.bin/ssh/key.c
+++ b/usr.bin/ssh/key.c
@@ -32,7 +32,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#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>
@@ -358,7 +358,7 @@ write_bignum(FILE *f, BIGNUM *num)
return 1;
}
-/* returns 1 ok, -1 error, 0 type mismatch */
+/* returns 1 ok, -1 error */
int
key_read(Key *ret, char **cpp)
{
@@ -413,7 +413,7 @@ key_read(Key *ret, char **cpp)
} else if (ret->type != type) {
/* is a key, but different type */
debug3("key_read: type mismatch");
- return 0;
+ return -1;
}
len = 2*strlen(cp);
blob = xmalloc(len);