head	1.2;
access;
symbols
	RELEASE_5_EOL:1.1
	RELEASE_7_0_0:1.1
	RELEASE_6_3_0:1.1
	PRE_XORG_7:1.1
	RELEASE_4_EOL:1.1
	RELEASE_6_2_0:1.1
	RELEASE_6_1_0:1.1
	RELEASE_5_5_0:1.1
	RELEASE_6_0_0:1.1
	RELEASE_5_4_0:1.1
	RELEASE_4_11_0:1.1
	RELEASE_5_3_0:1.1
	RELEASE_4_10_0:1.1
	RELEASE_5_2_1:1.1
	RELEASE_5_2_0:1.1
	RELEASE_4_9_0:1.1
	RELEASE_5_1_0:1.1
	RELEASE_4_8_0:1.1
	RELEASE_5_0_0:1.1
	RELEASE_4_7_0:1.1
	RELEASE_4_6_2:1.1
	RELEASE_4_6_1:1.1
	RELEASE_4_6_0:1.1
	RELEASE_5_0_DP1:1.1
	RELEASE_4_5_0:1.1
	RELEASE_4_4_0:1.1
	RELEASE_4_3_0:1.1
	RELEASE_4_2_0:1.1
	RELEASE_4_1_1:1.1
	RELEASE_4_1_0:1.1
	RELEASE_3_5_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2008.09.01.17.56.05;	author obrien;	state dead;
branches;
next	1.1;

1.1
date	2000.05.29.06.17.54;	author will;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Fix build on FreeBSD/i386 8-CURRENT.  (7.0 building with GCC 4.2)
@
text
@*** libs/pgpcdk/priv/networklib/keyserver/CCRSEntrustServer.cpp	2000/01/26 03:10:44	1.1.1.1
--- libs/pgpcdk/priv/networklib/keyserver/CCRSEntrustServer.cpp	2000/01/26 03:13:47	1.1.1.2
***************
*** 147,153 ****
  		if (! PGPKeySetRefIsValid(inCAsKeySet)) {
  			ThrowPGPError_(kPGPError_OptionNotFound);
  		}
! 		if (accumulatedCRLs == 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		}
  		pgpErr = PGPGetCRLDistributionPoints(inCAKey, inCAsKeySet, &numPoints, &points,
--- 147,153 ----
  		if (! PGPKeySetRefIsValid(inCAsKeySet)) {
  			ThrowPGPError_(kPGPError_OptionNotFound);
  		}
! 		if (accumulatedCRLs == (StPGPDataRef) 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		}
  		pgpErr = PGPGetCRLDistributionPoints(inCAKey, inCAsKeySet, &numPoints, &points,
***************
*** 173,179 ****
  #if PGP_COMPILER_SUN
  			pgpCopyMemory(static_cast<PGPByte *>(crl), static_cast<PGPByte *>(accumulatedCRLs) + accumulatedSize, crlSize);
  #else
! 			pgpCopyMemory(crl, static_cast<PGPByte *>(accumulatedCRLs) + accumulatedSize, crlSize);
  #endif
  			accumulatedSize += crlSize;
  			currPoint += *currPointSize;
--- 173,179 ----
  #if PGP_COMPILER_SUN
  			pgpCopyMemory(static_cast<PGPByte *>(crl), static_cast<PGPByte *>(accumulatedCRLs) + accumulatedSize, crlSize);
  #else
! 			pgpCopyMemory((void *) crl, static_cast<PGPByte *>(accumulatedCRLs) + accumulatedSize, crlSize);
  #endif
  			accumulatedSize += crlSize;
  			currPoint += *currPointSize;
***************
*** 215,221 ****
  						PGPNewData(	PGPGetContextMemoryMgr(mContext),
  									GetMaxBase64EncodedBufferSize(inMessageLength),
  									kPGPMemoryMgrFlags_None));
! 	if (encodedBuffer == 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	}
  	encodedSize = Base64Encode(	static_cast<const PGPByte *>(inMessage),
--- 215,221 ----
  						PGPNewData(	PGPGetContextMemoryMgr(mContext),
  									GetMaxBase64EncodedBufferSize(inMessageLength),
  									kPGPMemoryMgrFlags_None));
! 	if (encodedBuffer == (StPGPDataRef) 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	}
  	encodedSize = Base64Encode(	static_cast<const PGPByte *>(inMessage),
***************
*** 226,232 ****
  						PGPNewData(	PGPGetContextMemoryMgr(mContext),
  									GetMaxURLEncodedBufferSize(encodedSize) + bufSize,
  									kPGPMemoryMgrFlags_None));
! 	if (encodedBuffer == 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	}
  	strcpy(urlEncodedBuffer, kMessagePrefix);
--- 226,232 ----
  						PGPNewData(	PGPGetContextMemoryMgr(mContext),
  									GetMaxURLEncodedBufferSize(encodedSize) + bufSize,
  									kPGPMemoryMgrFlags_None));
! 	if (encodedBuffer == (StPGPDataRef) 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	}
  	strcpy(urlEncodedBuffer, kMessagePrefix);
@


1.1
log
@Update to PGP (International version) 6.5.1i.  This is actually a new
port, repo-copied from security/pgp5 by asami.

I added a bunch of the intl mirrors to make this port super-available.

PR:		16377
Submitted by:	Mike Sherwood <mike@@fate.com>
@
text
@@

