summaryrefslogtreecommitdiff
path: root/key.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-09-20 00:55:53 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-09-20 00:55:53 +0000
commit309f3d1d9c6a8f480de33a21f61809c14da97bdd (patch)
tree0e10c70437858f40d4f94149ca292412b5a938a4 /key.c
parent20daef753ddc7b1139d88532580ef40267f66d26 (diff)
- markus@cvs.openbsd.org 2001/09/19 13:23:29
[key.c] key_read() now returns -1 on type mismatch, too
Diffstat (limited to 'key.c')
-rw-r--r--key.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/key.c b/key.c
index b382f36cf..5c711b9d7 100644
--- a/key.c
+++ b/key.c
@@ -32,7 +32,7 @@
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34#include "includes.h" 34#include "includes.h"
35RCSID("$OpenBSD: key.c,v 1.31 2001/09/17 20:50:22 markus Exp $"); 35RCSID("$OpenBSD: key.c,v 1.32 2001/09/19 13:23:29 markus Exp $");
36 36
37#include <openssl/evp.h> 37#include <openssl/evp.h>
38 38
@@ -358,7 +358,7 @@ write_bignum(FILE *f, BIGNUM *num)
358 return 1; 358 return 1;
359} 359}
360 360
361/* returns 1 ok, -1 error, 0 type mismatch */ 361/* returns 1 ok, -1 error */
362int 362int
363key_read(Key *ret, char **cpp) 363key_read(Key *ret, char **cpp)
364{ 364{
@@ -413,7 +413,7 @@ key_read(Key *ret, char **cpp)
413 } else if (ret->type != type) { 413 } else if (ret->type != type) {
414 /* is a key, but different type */ 414 /* is a key, but different type */
415 debug3("key_read: type mismatch"); 415 debug3("key_read: type mismatch");
416 return 0; 416 return -1;
417 } 417 }
418 len = 2*strlen(cp); 418 len = 2*strlen(cp);
419 blob = xmalloc(len); 419 blob = xmalloc(len);