*** ./mozilla/security/nss/lib/util/secder.h.ORIG Sat Feb 5 20:27:10 2011 --- ./mozilla/security/nss/lib/util/secder.h Sat Feb 5 20:32:35 2011 *************** *** 126,134 **** ** The caller is responsible for freeing up the buffer which ** result->data points to upon a successful operation. */ ! extern SECStatus DER_TimeToUTCTime(SECItem *result, PRTime time); extern SECStatus DER_TimeToUTCTimeArena(PLArenaPool* arenaOpt, ! SECItem *dst, PRTime gmttime); /* --- 126,134 ---- ** The caller is responsible for freeing up the buffer which ** result->data points to upon a successful operation. */ ! extern SECStatus DER_TimeToUTCTime(SECItem *result, int64 time); extern SECStatus DER_TimeToUTCTimeArena(PLArenaPool* arenaOpt, ! SECItem *dst, int64 gmttime); /* *************** *** 137,148 **** ** "result" the resulting NSPR time ** "string" the der notation ascii value to decode */ ! extern SECStatus DER_AsciiToTime(PRTime *result, const char *string); /* ** Same as DER_AsciiToTime except takes an SECItem instead of a string */ ! extern SECStatus DER_UTCTimeToTime(PRTime *result, const SECItem *time); /* ** Convert a DER encoded UTC time to an ascii time representation --- 137,148 ---- ** "result" the resulting NSPR time ** "string" the der notation ascii value to decode */ ! extern SECStatus DER_AsciiToTime(int64 *result, const char *string); /* ** Same as DER_AsciiToTime except takes an SECItem instead of a string */ ! extern SECStatus DER_UTCTimeToTime(int64 *result, const SECItem *time); /* ** Convert a DER encoded UTC time to an ascii time representation *************** *** 168,176 **** ** gmttime must be on or after January 1, year 1 and ** before January 1, 10000. */ ! extern SECStatus DER_TimeToGeneralizedTime(SECItem *dst, PRTime gmttime); extern SECStatus DER_TimeToGeneralizedTimeArena(PLArenaPool* arenaOpt, ! SECItem *dst, PRTime gmttime); /* ** Convert a DER encoded Generalized time value into an NSPR time value. --- 168,176 ---- ** gmttime must be on or after January 1, year 1 and ** before January 1, 10000. */ ! extern SECStatus DER_TimeToGeneralizedTime(SECItem *dst, int64 gmttime); extern SECStatus DER_TimeToGeneralizedTimeArena(PLArenaPool* arenaOpt, ! SECItem *dst, int64 gmttime); /* ** Convert a DER encoded Generalized time value into an NSPR time value. *************** *** 177,189 **** ** "dst" the resulting NSPR time ** "string" the der notation ascii value to decode */ ! extern SECStatus DER_GeneralizedTimeToTime(PRTime *dst, const SECItem *time); /* ** Convert from a PRTime UTC time value to a formatted ascii value. The ** caller is responsible for deallocating the returned buffer. */ ! extern char *CERT_UTCTime2FormattedAscii (PRTime utcTime, char *format); #define CERT_GeneralizedTime2FormattedAscii CERT_UTCTime2FormattedAscii /* --- 177,189 ---- ** "dst" the resulting NSPR time ** "string" the der notation ascii value to decode */ ! extern SECStatus DER_GeneralizedTimeToTime(int64 *dst, const SECItem *time); /* ** Convert from a PRTime UTC time value to a formatted ascii value. The ** caller is responsible for deallocating the returned buffer. */ ! extern char *CERT_UTCTime2FormattedAscii (int64 utcTime, char *format); #define CERT_GeneralizedTime2FormattedAscii CERT_UTCTime2FormattedAscii /* *************** *** 190,196 **** ** Convert from a PRTime Generalized time value to a formatted ascii value. The ** caller is responsible for deallocating the returned buffer. */ ! extern char *CERT_GenTime2FormattedAscii (PRTime genTime, char *format); /* ** decode a SECItem containing either a SEC_ASN1_GENERALIZED_TIME --- 190,196 ---- ** Convert from a PRTime Generalized time value to a formatted ascii value. The ** caller is responsible for deallocating the returned buffer. */ ! extern char *CERT_GenTime2FormattedAscii (int64 genTime, char *format); /* ** decode a SECItem containing either a SEC_ASN1_GENERALIZED_TIME *** ./mozilla/security/nss/lib/certdb/certi.h.ORIG Sat Feb 5 22:07:50 2011 --- ./mozilla/security/nss/lib/certdb/certi.h Sat Feb 5 22:07:58 2011 *************** *** 271,277 **** * Automatically creates the cache object if it doesn't exist yet. */ SECStatus AcquireDPCache(CERTCertificate* issuer, const SECItem* subject, ! const SECItem* dp, int64 t, void* wincx, CRLDPCache** dpcache, PRBool* writeLocked); /* check if a particular SN is in the CRL cache and return its entry */ --- 271,277 ---- * Automatically creates the cache object if it doesn't exist yet. */ SECStatus AcquireDPCache(CERTCertificate* issuer, const SECItem* subject, ! const SECItem* dp, PRTime t, void* wincx, CRLDPCache** dpcache, PRBool* writeLocked); /* check if a particular SN is in the CRL cache and return its entry */ *** ./mozilla/security/nss/lib/certdb/cert.h.ORIG Sat Feb 5 22:01:47 2011 --- ./mozilla/security/nss/lib/certdb/cert.h Sat Feb 5 22:06:12 2011 *************** *** 196,202 **** ** "notBefore" the time before which the validity is not valid ** "notAfter" the time after which the validity is not valid */ ! extern CERTValidity *CERT_CreateValidity(PRTime notBefore, PRTime notAfter); /* ** Destroy a validity object. --- 196,202 ---- ** "notBefore" the time before which the validity is not valid ** "notAfter" the time after which the validity is not valid */ ! extern CERTValidity *CERT_CreateValidity(int64 notBefore, int64 notAfter); /* ** Destroy a validity object. *************** *** 326,332 **** extern CERTCertDBHandle *CERT_GetDefaultCertDB(void); extern CERTCertList *CERT_GetCertChainFromCert(CERTCertificate *cert, ! PRTime time, SECCertUsage usage); extern CERTCertificate * CERT_NewTempCertificate (CERTCertDBHandle *handle, SECItem *derCert, --- 326,332 ---- extern CERTCertDBHandle *CERT_GetDefaultCertDB(void); extern CERTCertList *CERT_GetCertChainFromCert(CERTCertificate *cert, ! int64 time, SECCertUsage usage); extern CERTCertificate * CERT_NewTempCertificate (CERTCertDBHandle *handle, SECItem *derCert, *************** *** 627,633 **** * Find the issuer of a cert */ CERTCertificate * ! CERT_FindCertIssuer(CERTCertificate *cert, PRTime validTime, SECCertUsage usage); /* ** Check the validity times of a certificate vs. time 't', allowing --- 627,633 ---- * Find the issuer of a cert */ CERTCertificate * ! CERT_FindCertIssuer(CERTCertificate *cert, int64 validTime, SECCertUsage usage); /* ** Check the validity times of a certificate vs. time 't', allowing *************** *** 673,679 **** */ extern SECStatus CERT_VerifySignedData(CERTSignedData *sd, CERTCertificate *cert, ! PRTime t, void *wincx); /* ** verify the signature of a signed data object with the given DER publickey --- 673,679 ---- */ extern SECStatus CERT_VerifySignedData(CERTSignedData *sd, CERTCertificate *cert, ! int64 t, void *wincx); /* ** verify the signature of a signed data object with the given DER publickey *************** *** 701,707 **** extern SECStatus CERT_VerifyCertificate(CERTCertDBHandle *handle, CERTCertificate *cert, PRBool checkSig, SECCertificateUsage requiredUsages, ! PRTime t, void *wincx, CERTVerifyLog *log, SECCertificateUsage* returnedUsages); /* same as above, but uses current time */ --- 701,707 ---- extern SECStatus CERT_VerifyCertificate(CERTCertDBHandle *handle, CERTCertificate *cert, PRBool checkSig, SECCertificateUsage requiredUsages, ! int64 t, void *wincx, CERTVerifyLog *log, SECCertificateUsage* returnedUsages); /* same as above, but uses current time */ *************** *** 717,723 **** */ extern SECStatus CERT_VerifyCACertForUsage(CERTCertDBHandle *handle, CERTCertificate *cert, ! PRBool checkSig, SECCertUsage certUsage, PRTime t, void *wincx, CERTVerifyLog *log); /* --- 717,723 ---- */ extern SECStatus CERT_VerifyCACertForUsage(CERTCertDBHandle *handle, CERTCertificate *cert, ! PRBool checkSig, SECCertUsage certUsage, int64 t, void *wincx, CERTVerifyLog *log); /* *************** *** 730,736 **** */ extern SECStatus CERT_VerifyCert(CERTCertDBHandle *handle, CERTCertificate *cert, ! PRBool checkSig, SECCertUsage certUsage, PRTime t, void *wincx, CERTVerifyLog *log); /* same as above, but uses current time */ --- 730,736 ---- */ extern SECStatus CERT_VerifyCert(CERTCertDBHandle *handle, CERTCertificate *cert, ! PRBool checkSig, SECCertUsage certUsage, int64 t, void *wincx, CERTVerifyLog *log); /* same as above, but uses current time */ *************** *** 740,746 **** SECStatus CERT_VerifyCertChain(CERTCertDBHandle *handle, CERTCertificate *cert, ! PRBool checkSig, SECCertUsage certUsage, PRTime t, void *wincx, CERTVerifyLog *log); /* --- 740,746 ---- SECStatus CERT_VerifyCertChain(CERTCertDBHandle *handle, CERTCertificate *cert, ! PRBool checkSig, SECCertUsage certUsage, int64 t, void *wincx, CERTVerifyLog *log); /* *************** *** 1043,1049 **** (CERTCrl *crl, int tag, SECItem *value); extern SECStatus ! CERT_FindInvalidDateExten (CERTCrl *crl, PRTime *value); /* ** Set up a crl for adding X509v3 extensions. Returns an opaque handle --- 1043,1049 ---- (CERTCrl *crl, int tag, SECItem *value); extern SECStatus ! CERT_FindInvalidDateExten (CERTCrl *crl, int64 *value); /* ** Set up a crl for adding X509v3 extensions. Returns an opaque handle *************** *** 1316,1322 **** */ CERTCertList * CERT_CreateSubjectCertList(CERTCertList *certList, CERTCertDBHandle *handle, ! SECItem *name, PRTime sorttime, PRBool validOnly); /* * remove certs from a list that don't have keyUsage and certType --- 1316,1322 ---- */ CERTCertList * CERT_CreateSubjectCertList(CERTCertList *certList, CERTCertDBHandle *handle, ! SECItem *name, int64 sorttime, PRBool validOnly); /* * remove certs from a list that don't have keyUsage and certType *************** *** 1467,1473 **** CERTCertificate * CERT_FindMatchingCert(CERTCertDBHandle *handle, SECItem *derName, CERTCertOwner owner, SECCertUsage usage, ! PRBool preferTrusted, PRTime validTime, PRBool validOnly); /* * Acquire the global lock on the cert database. --- 1467,1473 ---- CERTCertificate * CERT_FindMatchingCert(CERTCertDBHandle *handle, SECItem *derName, CERTCertOwner owner, SECCertUsage usage, ! PRBool preferTrusted, int64 validTime, PRBool validOnly); /* * Acquire the global lock on the cert database. *** ./mozilla/security/nss/lib/freebl/stubs.c.ORIG Sat Feb 5 21:25:56 2011 --- ./mozilla/security/nss/lib/freebl/stubs.c Sat Feb 5 21:35:51 2011 *************** *** 345,350 **** --- 345,354 ---- extern char * PR_GetLibraryFilePathname_stub(const char *name, PRFuncPtr addr) { + #ifdef _AIX + /* AIX does not have Dl_info in and dladdr() ! */ + return NULL; + #else Dl_info dli; char *result; *************** *** 358,363 **** --- 362,368 ---- strcpy(result, dli.dli_fname); } return result; + #endif } *************** *** 538,545 **** --- 543,555 ---- /* * fetch the library if it's loaded. For NSS it should already be loaded */ + #ifdef _AIX #define freebl_getLibrary(libName) \ + dlopen (libName, RTLD_LAZY) + #else + #define freebl_getLibrary(libName) \ dlopen (libName, RTLD_LAZY|RTLD_NOLOAD) + #endif #define freebl_releaseLibrary(lib) \ if (lib) dlclose(lib) *** ./mozilla/security/nss/lib/certhigh/ocsp.h.ORIG Sat Feb 5 22:09:18 2011 --- ./mozilla/security/nss/lib/certhigh/ocsp.h Sat Feb 5 22:12:00 2011 *************** *** 246,252 **** * Other errors are low-level problems (no memory, bad database, etc.). */ extern CERTOCSPRequest * ! CERT_CreateOCSPRequest(CERTCertList *certList, PRTime time, PRBool addServiceLocator, CERTCertificate *signerCert); --- 246,252 ---- * Other errors are low-level problems (no memory, bad database, etc.). */ extern CERTOCSPRequest * ! CERT_CreateOCSPRequest(CERTCertList *certList, int64 time, PRBool addServiceLocator, CERTCertificate *signerCert); *************** *** 394,400 **** */ extern SECItem * CERT_GetEncodedOCSPResponse(PLArenaPool *arena, CERTCertList *certList, ! char *location, PRTime time, PRBool addServiceLocator, CERTCertificate *signerCert, void *pwArg, CERTOCSPRequest **pRequest); --- 394,400 ---- */ extern SECItem * CERT_GetEncodedOCSPResponse(PLArenaPool *arena, CERTCertList *certList, ! char *location, int64 time, PRBool addServiceLocator, CERTCertificate *signerCert, void *pwArg, CERTOCSPRequest **pRequest); *************** *** 549,555 **** */ extern SECStatus CERT_CheckOCSPStatus(CERTCertDBHandle *handle, CERTCertificate *cert, ! PRTime time, void *pwArg); /* * FUNCTION: CERT_CacheOCSPResponseFromSideChannel --- 549,555 ---- */ extern SECStatus CERT_CheckOCSPStatus(CERTCertDBHandle *handle, CERTCertificate *cert, ! int64 time, void *pwArg); /* * FUNCTION: CERT_CacheOCSPResponseFromSideChannel *************** *** 582,588 **** extern SECStatus CERT_CacheOCSPResponseFromSideChannel(CERTCertDBHandle *handle, CERTCertificate *cert, ! PRTime time, SECItem *encodedResponse, void *pwArg); --- 582,588 ---- extern SECStatus CERT_CacheOCSPResponseFromSideChannel(CERTCertDBHandle *handle, CERTCertificate *cert, ! int64 time, SECItem *encodedResponse, void *pwArg); *************** *** 610,616 **** CERTOCSPResponse *response, CERTOCSPCertID *certID, CERTCertificate *signerCert, ! PRTime time); /* * FUNCTION CERT_GetOCSPResponseStatus --- 610,616 ---- CERTOCSPResponse *response, CERTOCSPCertID *certID, CERTCertificate *signerCert, ! int64 time); /* * FUNCTION CERT_GetOCSPResponseStatus *************** *** 648,654 **** * certID is no longer necessary. */ extern CERTOCSPCertID* ! CERT_CreateOCSPCertID(CERTCertificate *cert, PRTime time); /* * FUNCTION: CERT_DestroyOCSPCertID --- 648,654 ---- * certID is no longer necessary. */ extern CERTOCSPCertID* ! CERT_CreateOCSPCertID(CERTCertificate *cert, int64 time); /* * FUNCTION: CERT_DestroyOCSPCertID *** ./mozilla/security/nss/cmd/manifest.mn.ORIG Sun Feb 6 21:49:43 2011 --- ./mozilla/security/nss/cmd/manifest.mn Sun Feb 6 21:49:52 2011 *************** *** 70,76 **** selfserv \ signtool \ signver \ - shlibsign \ smimetools \ ssltap \ strsclnt \ --- 70,75 ----