Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b=98068 Add PR_CALLBACK for changed interfaces in NSS_3_4

Browse Source 
r=javi sr=blizzard


git-svn-id: svn://10.0.0.236/trunk@113039 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kaie%netscape.com
2002-01-28 15:23:59 +00:00
parent c9542ea086
commit d806ea955b
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp
View File

@@ -115,7 +115,12 @@ nsSSLStatus::~nsSSLStatus()
}
char* PK11PasswordPrompt(PK11SlotInfo* slot, PRBool retry, void* arg) {
#ifdef NSS_3_4
char* PR_CALLBACK
#else
char*
#endif
PK11PasswordPrompt(PK11SlotInfo* slot, PRBool retry, void* arg) {
nsresult rv = NS_OK;
PRUnichar *password = nsnull;
PRBool value = PR_FALSE;

8
mozilla/security/manager/ssl/src/nsNSSCallbacks.h
View File

@@ -27,7 +27,13 @@
#include "pk11func.h"
#include "nspr.h"
char* PK11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void* arg);
#ifdef NSS_3_4
char* PR_CALLBACK
#else
char*
#endif
PK11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void* arg);
void PR_CALLBACK HandshakeCallback(PRFileDesc *fd, void *client_data);
SECStatus PR_CALLBACK AuthCertificateCallback(void* client_data, PRFileDesc* fd,
PRBool checksig, PRBool isServer);

7
mozilla/security/manager/ssl/src/nsNSSComponent.cpp
View File

@@ -116,7 +116,12 @@ OSErr ConvertMacPathToUnixPath(const char *macPath, char **unixPath)
#endif
// XXX tmp callback for slot password
extern char * pk11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void *arg);
#ifdef NSS_3_4
extern char * PR_CALLBACK
#else
extern char *
#endif
pk11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void *arg);
#define PIPNSS_STRBUNDLE_URL "chrome://pipnss/locale/pipnss.properties"