Resolves: #214728

Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NET_SSL (Comment #5)

3 files changed, 0 insertions, 64 deletions

diff --git a/ldap/servers/plugins/pwdstorage/pwdstorage.h b/ldap/servers/plugins/pwdstorage/pwdstorage.h
index 70fe11ba..83e885de 100644
--- a/ldap/servers/plugins/pwdstorage/pwdstorage.h
+++ b/ldap/servers/plugins/pwdstorage/pwdstorage.h
@@ -103,64 +103,4 @@ int ns_mta_md5_pw_cmp( char *userpwd, char *dbpwd );
 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 */
diff --git a/ldap/servers/plugins/pwdstorage/sha_pwd.c b/ldap/servers/plugins/pwdstorage/sha_pwd.c
index 0f4247cb..f1389f69 100644
--- a/ldap/servers/plugins/pwdstorage/sha_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/sha_pwd.c
@@ -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 */
diff --git a/ldap/servers/plugins/pwdstorage/ssha_pwd.c b/ldap/servers/plugins/pwdstorage/ssha_pwd.c
index ac72e46e..b20e5012 100644
--- a/ldap/servers/plugins/pwdstorage/ssha_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/ssha_pwd.c
@@ -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 */