• Modified credits and license

• Removed some now-unnecessary configuration options from config.h • Removed unix crypt support • Added support for sha512
JKingweb · Jul 12, 2015 · faad259 · faad259
1 parent 11baccc
commit faad259
Show file tree

Hide file tree

Showing 10 changed files with 737 additions and 91 deletions.
diff --git a/CHANGELOG b/CHANGELOG
diff --git a/CREDITS b/CREDITS
@@ -1,11 +1,9 @@
-Upstream Author: David D.W. Downey ("pgpkeys") <david-downey@codecastle.com>
-Upstream Source was: http://libpam-pgsql.codecastle.com
-
 Copyright (c) 2000. Leon J Breedt <ljb@debian.org>, 
 Copyright (c) 2002. David D.W. Downey ("pgpkeys") <david-downey@codecastle.com>,
 Copyright (c) 2003. Joerg Wendland <joergland@debian.org>,
-Copyright (c) 2005. Primoz Bratanic <primoz@slo-tech.com>
-
+Copyright (c) 2005. Primoz Bratanic <primoz@slo-tech.com>,
+Copyright (c) 2008. Corey Henderson <admin@ravencore.com>,
+Copyright (c) 2010. Sam Nguyen.
 
 You are free to distribute this software under the terms of
 the GNU General Public License v3.0 or later.

diff --git a/LICENSE b/LICENSE
@@ -1,13 +1,16 @@
                           pam_sqlite3
 
-             This work is Copyright (C) Corey Henderson
+         This work is Copyright © J. King, Dustin Wilson
                            GNU GPL v3
- This work is a dirivative of pam_sqlite, Copyright (C) Edin Kadriba
-   pam_sqlite is a dirivative of libpam-pgsql, see the CREDITS file
+
+This work is a derivative of pam_sqlite3, Copyright © Corey Henderson, 
+Sam Nguyen which in turn is a derivative of pam_sqlite, Copyright © Edin 
+Kadriba which in turn is a derivative of libpam-pgsql, see the CREDITS 
+file.
 
 Different portions of this program are Copyright to the respective
-authors of those peices of code; but are all under the terms
-of of the GNU General Pulblic License.
+authors of those pieces of code; but are all under the terms
+of of the GNU General Public License.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/NEWS b/NEWS
diff --git a/config.h.in b/config.h.in
@@ -17,23 +17,5 @@
 /* Define if you have the pam library (-lpam).  */
 #undef HAVE_LIBPAM
 
-/* Define if you have <crypt.h> header file */
-#undef HAVE_CRYPT_H
-
-/* Define if you have <unistd.h> header file */
-#undef HAVE_UNISTD_H
-
 /* Define if you have <sys/types.h> header file */
-#undef HAVE_SYS_TYPES_H
-
-/* Define if your system crypt() supports standard DES encryption */
-#undef HAVE_STD_DES_CRYPT
-
-/* Define if your system crypt() supports extended DES encryption */
-#undef HAVE_EXT_DES_CRYPT
-
-/* Define if your system crypt() supports MD5 encryption */
-#undef HAVE_MD5_CRYPT
-
-/* Define if your system crypt() supports blowfish encryption */
-#undef HAVE_BLOWFISH_CRYPT
+#undef HAVE_SYS_TYPES_H
diff --git a/crypt.c b/crypt.c
@@ -0,0 +1,32 @@
+/* 
+ * Copyright (c) 2015. J. King, Dustin Wilson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ */
+
+#include "crypt_sha512.h"
+
+char *crypt(const char *key, const char *salt) {
+    return sha512_crypt(key, salt);
+}
diff --git a/crypt.h b/crypt.h
@@ -0,0 +1,30 @@
+/* 
+ * Copyright (c) 2015. J. King, Dustin Wilson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ */
+
+#include "crypt_sha512.h"
+
+char *crypt(const char *key,const char *salt);