summaryrefslogtreecommitdiffstats
path: root/security/pgp6/files/patch-ak
blob: bb074fa2389137557dce5271bd27cfd1bee8167f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
*** 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);
OpenPOWER on IntegriCloud