bjori Mon, 12 Sep 2011 10:24:27 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316526
Log:
Sync line ending with 5_4
Changed paths:
U php/php-src/trunk/ext/standard/crypt_blowfish.h
Modified: php/php-src/trunk/ext/standard/crypt_blowfish.h
===================================================================
--- php/php-src/trunk/ext/standard/crypt_blowfish.h 2011-09-12 10:20:34 UTC
(rev 316525)
+++ php/php-src/trunk/ext/standard/crypt_blowfish.h 2011-09-12 10:24:27 UTC
(rev 316526)
@@ -1,32 +1,32 @@
-/* $Id$ */
-/*
- * Written by Solar Designer <solar at openwall.com> in 2000-2011.
- * No copyright is claimed, and the software is hereby placed in the public
- * domain. In case this attempt to disclaim copyright and place the software
- * in the public domain is deemed null and void, then the software is
- * Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
- * general public under the following terms:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- *
- * See crypt_blowfish.c for more information.
- */
-
-#ifndef _CRYPT_BLOWFISH_H
-#define _CRYPT_BLOWFISH_H
-
-#if 0
-extern int _crypt_output_magic(const char *setting, char *output, int size);
-#endif
-extern char *php_crypt_blowfish_rn(const char *key, const char *setting,
- char *output, int size);
-#if 0
-extern char *_crypt_gensalt_blowfish_rn(const char *prefix,
- unsigned long count,
- const char *input, int size, char *output, int output_size);
-#endif
-
-#endif
+/* $Id$ */
+/*
+ * Written by Solar Designer <solar at openwall.com> in 2000-2011.
+ * No copyright is claimed, and the software is hereby placed in the public
+ * domain. In case this attempt to disclaim copyright and place the software
+ * in the public domain is deemed null and void, then the software is
+ * Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
+ * general public under the following terms:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ *
+ * See crypt_blowfish.c for more information.
+ */
+
+#ifndef _CRYPT_BLOWFISH_H
+#define _CRYPT_BLOWFISH_H
+
+#if 0
+extern int _crypt_output_magic(const char *setting, char *output, int size);
+#endif
+extern char *php_crypt_blowfish_rn(const char *key, const char *setting,
+ char *output, int size);
+#if 0
+extern char *_crypt_gensalt_blowfish_rn(const char *prefix,
+ unsigned long count,
+ const char *input, int size, char *output, int output_size);
+#endif
+
+#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
