Browse Source

standards compliant error return (null). will make ruby happier, at least.

ok deraadt jeremy
OPENBSD_5_8
tedu 9 years ago
parent
commit
ece73ab6e1
1 changed files with 2 additions and 5 deletions
  1. +2
    -5
      src/lib/libc/crypt/bcrypt.c

+ 2
- 5
src/lib/libc/crypt/bcrypt.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: bcrypt.c,v 1.52 2015/01/28 23:33:52 tedu Exp $ */
/* $OpenBSD: bcrypt.c,v 1.53 2015/07/18 00:56:37 tedu Exp $ */
/* /*
* Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
@ -385,12 +385,9 @@ char *
bcrypt(const char *pass, const char *salt) bcrypt(const char *pass, const char *salt)
{ {
static char gencrypted[BCRYPT_HASHSPACE]; static char gencrypted[BCRYPT_HASHSPACE];
static char gerror[2];
/* How do I handle errors ? Return ':' */
strlcpy(gerror, ":", sizeof(gerror));
if (bcrypt_hashpass(pass, salt, gencrypted, sizeof(gencrypted)) != 0) if (bcrypt_hashpass(pass, salt, gencrypted, sizeof(gencrypted)) != 0)
return gerror;
return NULL;
return gencrypted; return gencrypted;
} }

Loading…
Cancel
Save