windows fixes

8 files changed, 51 insertions, 53 deletions

diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk
index fca21989c..2ca01a1a1 100644
--- a/security/nss/cmd/platlibs.mk
+++ b/security/nss/cmd/platlibs.mk
@@ -37,6 +37,7 @@ ifeq ($(OS_ARCH), WINNT)
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 EXTRA_LIBS += \
 	$(DIST)/lib/cmdutil.lib \
+	$(DIST)/lib/ssl4.lib \
 	$(DIST)/lib/nsspkix4.lib \
 	$(DIST)/lib/nss4.lib \
 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
diff --git a/security/nss/cmd/selfserv/selfserv.c b/security/nss/cmd/selfserv/selfserv.c
index 87b6c16da..1e24ce023 100644
--- a/security/nss/cmd/selfserv/selfserv.c
+++ b/security/nss/cmd/selfserv/selfserv.c
@@ -1287,7 +1287,8 @@ readBigFile(const char * fileName)
 
 	memcpy(bigBuf.data, outHeader, hdrLen);
 
-	count = PR_Read(local_file_fd, bigBuf.data + hdrLen, info.size);
+	count = PR_Read(local_file_fd, 
+	                (unsigned char *)bigBuf.data + hdrLen, info.size);
 	if (count != info.size) {
 	    errWarn("PR_Read local file");
 	    goto done;
@@ -1414,9 +1415,9 @@ main(int argc, char **argv)
     PRBool               debugCache = PR_FALSE; /* bug 90518 */
     NSSTrustDomain *     td = NULL;
     NSSUsages            serverUsage = { 0, NSSUsage_SSLServer };
+    NSSCallback *pwcb;
 #ifdef LINUX  /* bug 119340 */
     struct sigaction     act;
-    NSSCallback *pwcb;
 
     act.sa_handler = sigterm_handler;
     sigemptyset(&act.sa_mask);
diff --git a/security/nss/lib/base/nssbase.h b/security/nss/lib/base/nssbase.h
index f5327494b..18ee7876d 100644
--- a/security/nss/lib/base/nssbase.h
+++ b/security/nss/lib/base/nssbase.h
@@ -157,7 +157,7 @@ NSS_GetErrorStack (
 );
 
 #define NSSITEM_INIT(it, b, l) \
-  (it)->data = (void *)b;      \
+  (it)->data = (void *)(b);      \
   (it)->size = l;
 
 NSS_EXTERN NSSItem *
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 950b64938..8fc76c659 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -171,7 +171,6 @@ NSSPublicKey_GetKeyInfo;
 ;+#NSSPublicKey_GetToken;
 ;+#NSSPublicKey_GetSlot;
 ;+#NSSPublicKey_GetModule;
-NSSPublicKey_GetInfo;
 NSSPublicKey_GetKeyType;
 NSSPublicKey_GetKeyStrength;
 NSSPublicKey_Encrypt;
diff --git a/security/nss/lib/pki/asymmkey.c b/security/nss/lib/pki/asymmkey.c
index 3b5e366d4..708dc0bc0 100644
--- a/security/nss/lib/pki/asymmkey.c
+++ b/security/nss/lib/pki/asymmkey.c
@@ -241,53 +241,53 @@ nssPrivateKey_CopyToToken (
 }
 
 NSS_IMPLEMENT PRUint32
-nssPrivateKey_GetSignatureLength (
+nssPrivateKey_GetPrivateModulusLength (
   NSSPrivateKey *vk
 )
 {
-    /* XXX based on PK11_SignatureLen */
+    /* XXX based on PK11_GetPrivateModulusLen, always only for RSA?
+     *     maybe GetKeyStrength?
+     */
     switch (vk->kind) {
     case NSSKeyPairType_RSA:
-	/* old function had fallback for non-compliant tokens, still needed? */
-	return nssPrivateKey_GetPrivateModulusLength(vk);
-    case NSSKeyPairType_DSA:
-	return 40;
+	    /* XXX cheating by using first instance */
+	return nssCryptokiRSAPrivateKey_GetModulusLength(vk->object.instances[0]);
     default:
-	return 0;
+	return -1;
     }
 }
 
 NSS_IMPLEMENT PRUint32
-NSSPrivateKey_GetSignatureLength (
+NSSPrivateKey_GetPrivateModulusLength (
   NSSPrivateKey *vk
 )
 {
-    return nssPrivateKey_GetSignatureLength(vk);
+    return nssPrivateKey_GetPrivateModulusLength(vk);
 }
 
 NSS_IMPLEMENT PRUint32
-nssPrivateKey_GetPrivateModulusLength (
+nssPrivateKey_GetSignatureLength (
   NSSPrivateKey *vk
 )
 {
-    /* XXX based on PK11_GetPrivateModulusLen, always only for RSA?
-     *     maybe GetKeyStrength?
-     */
+    /* XXX based on PK11_SignatureLen */
     switch (vk->kind) {
     case NSSKeyPairType_RSA:
-	    /* XXX cheating by using first instance */
-	return nssCryptokiRSAPrivateKey_GetModulusLength(vk->object.instances[0]);
+	/* old function had fallback for non-compliant tokens, still needed? */
+	return nssPrivateKey_GetPrivateModulusLength(vk);
+    case NSSKeyPairType_DSA:
+	return 40;
     default:
-	return -1;
+	return 0;
     }
 }
 
 NSS_IMPLEMENT PRUint32
-NSSPrivateKey_GetPrivateModulusLength (
+NSSPrivateKey_GetSignatureLength (
   NSSPrivateKey *vk
 )
 {
-    return nssPrivateKey_GetPrivateModulusLength(vk);
+    return nssPrivateKey_GetSignatureLength(vk);
 }
 
 NSS_IMPLEMENT PRBool
@@ -1307,7 +1307,7 @@ nssPublicKey_Encrypt (
     NSSItem *rvIt = NULL;
 
     if (apOpt) {
-	ap = apOpt;
+	ap = (NSSAlgNParam *)apOpt; /* XXX hmmmm.... */
     } else {
 	NSSOIDTag alg;
 	/* XXX are these defaults reasonable? */
diff --git a/security/nss/lib/ssl/config.mk b/security/nss/lib/ssl/config.mk
index b8edc7ff6..b4e3871c1 100644
--- a/security/nss/lib/ssl/config.mk
+++ b/security/nss/lib/ssl/config.mk
@@ -34,37 +34,37 @@
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
 # don't want the 32 in the shared library name
-#SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
-#IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
+SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
+IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
 
-#RES = $(OBJDIR)/ssl.res
-#RESNAME = ssl.rc
+RES = $(OBJDIR)/ssl.res
+RESNAME = ssl.rc
 
-#EXTRA_SHARED_LIBS += \
-	$(DIST)/lib/nss3.lib \
-#	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
-#	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \
-#	$(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \
-#	$(NULL)
+EXTRA_SHARED_LIBS += \
+	$(DIST)/lib/nss4.lib \
+	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
+	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \
+	$(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \
+	$(NULL)
 else
 
 
 # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
 # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
-#EXTRA_SHARED_LIBS += \
-#	-L$(DIST)/lib/ \
-#	-lnss3 \
-#	-lplc4 \
-#	-lplds4 \
-#	-lnspr4 \
-#	$(NULL)
+EXTRA_SHARED_LIBS += \
+	-L$(DIST)/lib/ \
+	-lnss4 \
+	-lplc4 \
+	-lplds4 \
+	-lnspr4 \
+	$(NULL)
 
 ifeq ($(OS_ARCH), BeOS)
 EXTRA_SHARED_LIBS += -lbe
 endif
 
 ifeq ($(OS_ARCH), Darwin)
-#EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
+EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
 endif
 
 endif
diff --git a/security/nss/lib/ssl/ssl.def b/security/nss/lib/ssl/ssl.def
index 7833ae741..469ac0753 100644
--- a/security/nss/lib/ssl/ssl.def
+++ b/security/nss/lib/ssl/ssl.def
@@ -49,16 +49,13 @@ LIBRARY ssl3 ;-
 EXPORTS ;-
 SSL_ImplementedCiphers DATA ;
 SSL_NumImplementedCiphers DATA ;
-NSS_CmpCertChainWCANames;
-NSS_FindCertKEAType;
-NSS_GetClientAuthData;
+;+#NSS_GetClientAuthData;
 NSS_SetDomesticPolicy;
 NSS_SetExportPolicy;
 NSS_SetFrancePolicy;
 SSL_AuthCertificate;
 SSL_AuthCertificateHook;
 SSL_BadCertHook;
-SSL_CertDBHandleSet;
 SSL_CipherPolicyGet;
 SSL_CipherPolicySet;
 SSL_CipherPrefGet;
@@ -83,8 +80,8 @@ SSL_OptionGetDefault;
 SSL_OptionSet;
 SSL_OptionSetDefault;
 SSL_PeerCertificate;
-SSL_PreencryptedFileToStream;
-SSL_PreencryptedStreamToFile;
+;+#SSL_PreencryptedFileToStream;
+;+#SSL_PreencryptedStreamToFile;
 SSL_ReHandshake;
 SSL_ResetHandshake;
 SSL_RestartHandshakeAfterCertReq;
@@ -109,9 +106,9 @@ NSSSSL_VersionCheck;
 ;+    global:
 SSL_GetChannelInfo;
 SSL_GetCipherSuiteInfo;
-SSL_GetMaxServerCacheLocks;
+;+#SSL_GetMaxServerCacheLocks;
 SSL_LocalCertificate;
-SSL_SetMaxServerCacheLocks;
+;+#SSL_SetMaxServerCacheLocks;
 ;+    local:
 ;+*;
 ;+};
diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c
index 60c88c0de..1c410c4d7 100644
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -69,6 +69,10 @@
 
 #include "nsslocks.h"
 
+/* XXX move to base.h!!! */
+#define NSSITEM_DATA(it, i) \
+    ((unsigned char *)(it)->data)[i]
+
 /* XXX */
 #define SSL_ERROR_INVALID_KEY_TYPE 5555
 #define SSL_ERROR_UNSUPPORTED_KEY_EXCHANGE_ALG 5556
@@ -5063,10 +5067,6 @@ ssl3_SendServerHelloSequence(sslSocket *ss)
     return SECSuccess;
 }
 
-/* XXX move to base.h!!! */
-#define NSSITEM_DATA(it, i) \
-    ((unsigned char *)(it)->data)[i]
-
 /* Called from ssl3_HandleHandshakeMessage() when it has deciphered a complete
  * ssl3 Client Hello message.
  * Caller must hold Handshake and RecvBuf locks.