remove md5crypt.

while changing things, add a crypt_checkpass wrapper that handles most of
the edge cases. (not quite ready for production, though.)
ok deraadt

1 files changed, 54 insertions, 0 deletions

diff --git a/src/lib/libc/crypt/cryptutil.c b/src/lib/libc/crypt/cryptutil.c
new file mode 100644
index 0000000000..36deda778e
--- /dev/null
+++ b/src/lib/libc/crypt/cryptutil.c
@@ -0,0 +1,54 @@
+/* $OpenBSD: cryptutil.c,v 1.1 2014/05/12 19:13:14 tedu Exp $ */
+/*
+ * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <pwd.h>
+#include <errno.h>
+
+int
+crypt_checkpass(const char *pass, const char *goodhash)
+{
+        char dummy[_PASSWORD_LEN];
+        char *res;
+
+        if (goodhash == NULL) {
+                /* fake it */
+                bcrypt_newhash(pass, 8, dummy, sizeof(dummy));
+                goto fail;
+        }
+
+        /* empty password */
+        if (strlen(goodhash) == 0 && strlen(pass) == 0)
+                return 0;
+
+        if (goodhash[0] == '$' && goodhash[1] == '2') {
+                return bcrypt_checkpass(pass, goodhash);
+        }
+
+        /* have to do it the hard way */
+        res = crypt(pass, goodhash);
+        if (strlen(res) != strlen(goodhash) ||
+            timingsafe_bcmp(res, goodhash, strlen(goodhash)) != 0) {
+                goto fail;
+        }
+
+        return 0;
+fail:
+        errno = EACCES;
+        return -1;
+}