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

Bug 491044: Remove support for VMS (a.k.a., OpenVMS) from NSS, r=rrelyea

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@257408 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelson%bolyard.com 2009-06-05 02:34:15 +00:00
parent 009591c814
commit d75e071b87
7 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/security/nss/cmd/certutil/keystuff.c
View File

@ -114,7 +114,7 @@ UpdateRNG(void)
/* turn off echo on stdin & return on 1 char instead of NL */
fd = fileno(stdin);
#if defined(XP_UNIX) && !defined(VMS)
#if defined(XP_UNIX)
tcgetattr(fd, &tio);
orig_lflag = tio.c_lflag;
orig_cc_min = tio.c_cc[VMIN];
@ -129,9 +129,7 @@ UpdateRNG(void)
/* Get random noise from keyboard strokes */
count = 0;
while (count < sizeof randbuf) {
#ifdef VMS
c = GENERIC_GETCHAR_NOECHO();
#elif defined(XP_UNIX) || defined(WINCE)
#if defined(XP_UNIX) || defined(WINCE)
c = getc(stdin);
#else
c = getch();
@ -151,20 +149,15 @@ UpdateRNG(void)
FPS "\n\n");
FPS "Finished. Press enter to continue: ");
#if defined(VMS)
while((c = GENERIC_GETCHAR_NO_ECHO()) != '\r' && c != EOF)
;
#else
while ((c = getc(stdin)) != '\n' && c != EOF)
;
#endif
if (c == EOF)
rv = -1;
FPS "\n");
#undef FPS
#if defined(XP_UNIX) && !defined(VMS)
#if defined(XP_UNIX)
/* set back termio the way it was */
tio.c_lflag = orig_lflag;
tio.c_cc[VMIN] = orig_cc_min;

4
mozilla/security/nss/cmd/lib/secpwd.c
View File

@ -63,7 +63,7 @@ static char * quiet_fgets (char *buf, int length, FILE *input);
static void echoOff(int fd)
{
#if defined(XP_UNIX) && !defined(VMS)
#if defined(XP_UNIX)
if (isatty(fd)) {
struct termios tio;
tcgetattr(fd, &tio);
@ -75,7 +75,7 @@ static void echoOff(int fd)
static void echoOn(int fd)
{
#if defined(XP_UNIX) && !defined(VMS)
#if defined(XP_UNIX)
if (isatty(fd)) {
struct termios tio;
tcgetattr(fd, &tio);

4
mozilla/security/nss/cmd/lib/secutil.c
View File

@ -73,11 +73,7 @@
static char consoleName[] = {
#ifdef XP_UNIX
#ifdef VMS
"TT"
#else
"/dev/tty"
#endif
#else
#ifdef XP_OS2
"\\DEV\\CON"

18
mozilla/security/nss/cmd/shlibsign/sign.sh
View File

@ -21,24 +21,6 @@ WIN*)
echo ${2}/shlibsign -v -i ${5}
${2}/shlibsign -v -i ${5}
;;
OpenVMS)
temp="tmp$$.tmp"
temp2="tmp$$.tmp2"
cd ${1}/lib
vmsdir=`dcl show default`
ls *.so > $temp
sed -e "s/\([^\.]*\)\.so/\$ define\/job \1 ${vmsdir}\1.so/" $temp > $temp2
echo '$ define/job getipnodebyname xxx' >> $temp2
echo '$ define/job vms_null_dl_name sys$share:decc$shr' >> $temp2
dcl @$temp2
echo ${2}/shlibsign -v -i ${5}
${2}/shlibsign -v -i ${5}
sed -e "s/\([^\.]*\)\.so/\$ deass\/job \1/" $temp > $temp2
echo '$ deass/job getipnodebyname' >> $temp2
echo '$ deass/job vms_null_dl_name' >> $temp2
dcl @$temp2
rm $temp $temp2
;;
*)
LIBPATH=`(cd ${1}/lib; pwd)`:`(cd ${4}; pwd)`:$LIBPATH
export LIBPATH

4
mozilla/security/nss/lib/ssl/sslmutex.c
View File

@ -33,7 +33,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* $Id: sslmutex.c,v 1.23 2008-12-02 06:36:59 nelson%bolyard.com Exp $ */
/* $Id: sslmutex.c,v 1.24 2009-06-05 02:34:14 nelson%bolyard.com Exp $ */
#include "seccomon.h"
/* This ifdef should match the one in sslsnce.c */
@ -89,7 +89,7 @@ static SECStatus single_process_sslMutex_Lock(sslMutex* pMutex)
return SECSuccess;
}
#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
#if defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
#include <unistd.h>
#include <fcntl.h>

4
mozilla/security/nss/lib/ssl/sslmutex.h
View File

@ -33,7 +33,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* $Id: sslmutex.h,v 1.11 2008-12-02 06:36:59 nelson%bolyard.com Exp $ */
/* $Id: sslmutex.h,v 1.12 2009-06-05 02:34:15 nelson%bolyard.com Exp $ */
#ifndef __SSLMUTEX_H_
#define __SSLMUTEX_H_ 1
@ -83,7 +83,7 @@ typedef struct
typedef int sslPID;
#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
#elif defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
#include <sys/types.h>
#include "prtypes.h"

4
mozilla/security/nss/lib/ssl/sslsnce.c
View File

@ -36,7 +36,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* $Id: sslsnce.c,v 1.49 2008-12-02 06:36:59 nelson%bolyard.com Exp $ */
/* $Id: sslsnce.c,v 1.50 2009-06-05 02:34:15 nelson%bolyard.com Exp $ */
/* Note: ssl_FreeSID() in sslnonce.c gets used for both client and server
* cache sids!
@ -260,7 +260,7 @@ static PRBool isMultiProcess = PR_FALSE;
#define MAX_SSL3_TIMEOUT 86400L /* 24 hours */
#define MIN_SSL3_TIMEOUT 5 /* seconds */
#if defined(AIX) || defined(LINUX) || defined(VMS) || defined(NETBSD) || defined(OPENBSD)
#if defined(AIX) || defined(LINUX) || defined(NETBSD) || defined(OPENBSD)
#define MAX_SID_CACHE_LOCKS 8 /* two FDs per lock */
#elif defined(OSF1)
#define MAX_SID_CACHE_LOCKS 16 /* one FD per lock */