X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/f7436b8cb60de0a0edb1ca8b487accd50a363002..c48c32c1d58312e02017c436b7725a5793abfd42:/key.c diff --git a/key.c b/key.c index b382f36c..57df5b93 100644 --- a/key.c +++ b/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.33 2001/10/04 14:34:16 markus Exp $"); #include @@ -354,11 +354,11 @@ write_bignum(FILE *f, BIGNUM *num) return 0; } fprintf(f, " %s", buf); - xfree(buf); + OPENSSL_free(buf); 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);