[Fedora-directory-commits] ldapserver/ldap/servers/plugins/pwdstorage pwdstorage.h, 1.7, 1.8 sha_pwd.c, 1.6, 1.7 ssha_pwd.c, 1.7, 1.8

[Doctor Conrad]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/ldap/servers/plugins/pwdstorage

Modified Files:
    pwdstorage.h sha_pwd.c ssha_pwd.c 
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NET_SSL (Comment #5)

Index: pwdstorage.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/pwdstorage.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pwdstorage.h	6 Sep 2005 21:15:15 -0000	1.7
+++ pwdstorage.h	10 Nov 2006 01:10:51 -0000	1.8
@@ -103,64 +103,4 @@
 int md5_pw_cmp( char *userpwd, char *dbpwd );
 char *md5_pw_enc( char *pwd );

-
-#if !defined(NET_SSL)
-/******************************************/
-/*
- * Some of the stuff below depends on a definition for uint32, so
- * we include one here.  Other definitions appear in nspr/prtypes.h,
- * at least.  All the platforms we support use 32-bit ints.
- */
-typedef unsigned int uint32;
-
-
-/******************************************/
-/*
- * The following is from ds.h, which the libsec sec.h stuff depends on (see
- * comment below).
- */
-/*
-** A status code. Status's are used by procedures that return status
-** values. Again the motivation is so that a compiler can generate
-** warnings when return values are wrong. Correct testing of status codes:
-**
-**      DSStatus rv;
-**      rv = some_function (some_argument);
-**      if (rv != DSSuccess)
-**              do_an_error_thing();
-**
-*/
-typedef enum DSStatusEnum {
-    DSWouldBlock = -2,
-    DSFailure = -1,
-    DSSuccess = 0
-} DSStatus;
- 
- 
-/******************************************/
-/*
- * All of the SHA1-related defines are from libsec's "sec.h" -- including
- * it directly pulls in way too much stuff that we conflict with.  Ugh.
- */
- 
-/*
- * Number of bytes each hash algorithm produces
- */
-#define SHA1_LENGTH     20
-#define SHA256_LENGTH   32
-#define SHA384_LENGTH   48
-#define SHA512_LENGTH   64
- 
-/******************************************/
-/*
-** SHA-1 secure hash function
-*/
- 
-/*
-** Hash a null terminated string "src" into "dest" using SHA-1
-*/
-DSStatus SHA1_Hash(unsigned char *dest, char *src);
- 
-#endif /* !defined(NET_SSL) */
-
 #endif /* _PWDSTORAGE_H */

Index: sha_pwd.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/sha_pwd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sha_pwd.c	9 Oct 2006 21:42:57 -0000	1.6
+++ sha_pwd.c	10 Nov 2006 01:10:51 -0000	1.7
@@ -46,9 +46,7 @@

#include "pwdstorage.h"

-#if defined(NET_SSL)
 #include <sechash.h>
-#endif /* NET_SSL */

#define SHA_SALT_LENGTH    8   /* number of bytes of data in salt */
 #define NOT_FIRST_TIME (time_t)1 /* not the first logon */

Index: ssha_pwd.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/ssha_pwd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ssha_pwd.c	14 Sep 2005 23:37:37 -0000	1.7
+++ ssha_pwd.c	10 Nov 2006 01:10:51 -0000	1.8
@@ -48,10 +48,8 @@
 #include "prtime.h"
 #include "prlong.h"

-#if defined(NET_SSL)
 #include <pk11func.h>
 #include <pk11pqg.h>
-#endif /* NET_SSL */

#define SHA_SALT_LENGTH    8   /* number of bytes of data in salt */