summaryrefslogtreecommitdiff
path: root/security/pgp6/files/patch-an
blob: 3b149f2b1917d5f857186788af7c852ce763c434 (plain) (blame)
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
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
*** libs/pgpcdk/priv/networklib/keyserver/CHTTPXcertServer.cpp	2000/01/26 03:10:44	1.1.1.1
--- libs/pgpcdk/priv/networklib/keyserver/CHTTPXcertServer.cpp	2000/01/26 03:13:49	1.1.1.2
***************
*** 89,95 ****
  		digest = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  													GetMaxDigestedKeyBufferSize(),
  													kPGPMemoryMgrFlags_None));
! 		if (digest == 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		};
  		digestSize = DigestKey(inCAKey, digest);
--- 89,95 ----
  		digest = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  													GetMaxDigestedKeyBufferSize(),
  													kPGPMemoryMgrFlags_None));
! 		if (digest == (StPGPDataRef) 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		};
  		digestSize = DigestKey(inCAKey, digest);
***************
*** 98,104 ****
  			PGPNewData(	PGPGetContextMemoryMgr(mContext),
  						GetMaxBase64EncodedBufferSize(inBufferSize),
  						kPGPMemoryMgrFlags_None));
! 		if (encodedBuffer == 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		};
  		bufSize = Base64Encode(	static_cast<const PGPByte *>(inBuffer),
--- 98,104 ----
  			PGPNewData(	PGPGetContextMemoryMgr(mContext),
  						GetMaxBase64EncodedBufferSize(inBufferSize),
  						kPGPMemoryMgrFlags_None));
! 		if (encodedBuffer == (StPGPDataRef) 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		};
  		bufSize = Base64Encode(	static_cast<const PGPByte *>(inBuffer),
***************
*** 109,115 ****
  		cnk = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  													cnkSize,
  													kPGPMemoryMgrFlags_None));
! 		if (cnk == 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		}
  		pgpErr = PGPGetKeyPropertyBuffer(	inRequestKey,
--- 109,115 ----
  		cnk = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  													cnkSize,
  													kPGPMemoryMgrFlags_None));
! 		if (cnk == (StPGPDataRef) 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		}
  		pgpErr = PGPGetKeyPropertyBuffer(	inRequestKey,
***************
*** 121,127 ****
  		encodedCNK = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  														GetMaxHexEncodedBufferSize(cnkSize),
  														kPGPMemoryMgrFlags_None));
! 		if (encodedCNK == 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		}
  		cnkSize = HexEncode(cnk, cnkSize, encodedCNK);
--- 121,127 ----
  		encodedCNK = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  														GetMaxHexEncodedBufferSize(cnkSize),
  														kPGPMemoryMgrFlags_None));
! 		if (encodedCNK == (StPGPDataRef) 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		}
  		cnkSize = HexEncode(cnk, cnkSize, encodedCNK);
***************
*** 131,137 ****
  						strlen(kCA) + digestSize + strlen(kCNK) + cnkSize
  							+ strlen(kPKCS10_input) + GetMaxURLEncodedBufferSize(bufSize),
  						kPGPMemoryMgrFlags_None));
! 		if (post == 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		};
  		postSize = sprintf(post, "%s%s%s%s%s", kCA, static_cast<char *>(digest), kCNK,
--- 131,137 ----
  						strlen(kCA) + digestSize + strlen(kCNK) + cnkSize
  							+ strlen(kPKCS10_input) + GetMaxURLEncodedBufferSize(bufSize),
  						kPGPMemoryMgrFlags_None));
! 		if (post == (StPGPDataRef) 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		};
  		postSize = sprintf(post, "%s%s%s%s%s", kCA, static_cast<char *>(digest), kCNK,
***************
*** 196,202 ****
  		path = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  													strlen(prefix) + strlen(query) + 1,
  													kPGPMemoryMgrFlags_None));
! 		if (path == 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		}
  		sprintf(path, "%s%s", prefix, static_cast<char *>(query));
--- 196,202 ----
  		path = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  													strlen(prefix) + strlen(query) + 1,
  													kPGPMemoryMgrFlags_None));
! 		if (path == (StPGPDataRef) 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		}
  		sprintf(path, "%s%s", prefix, static_cast<char *>(query));
***************
*** 258,271 ****
  		digest = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  													GetMaxDigestedKeyBufferSize(),
  													kPGPMemoryMgrFlags_None));
! 		if (digest == 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		};
  		digestSize = DigestKey(inCAKey, digest);
  		path = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  													strlen(prefix) + digestSize + 1,
  													kPGPMemoryMgrFlags_None));
! 		if (path == 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		}
  		sprintf(path, "%s%s", prefix, static_cast<char *>(digest));
--- 258,271 ----
  		digest = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  													GetMaxDigestedKeyBufferSize(),
  													kPGPMemoryMgrFlags_None));
! 		if (digest == (StPGPDataRef) 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		};
  		digestSize = DigestKey(inCAKey, digest);
  		path = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  													strlen(prefix) + digestSize + 1,
  													kPGPMemoryMgrFlags_None));
! 		if (path == (StPGPDataRef) 0) {
  			ThrowPGPError_(kPGPError_OutOfMemory);
  		}
  		sprintf(path, "%s%s", prefix, static_cast<char *>(digest));
***************
*** 323,329 ****
  		PGPNewData(	PGPGetContextMemoryMgr(mContext),
  					GetMaxBase64EncodedBufferSize(bufSize),
  					kPGPMemoryMgrFlags_None));
! 	if (encodedBuffer == 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	};
  	bufSize = Base64Encode(	static_cast<const PGPByte *>(buffer),
--- 323,329 ----
  		PGPNewData(	PGPGetContextMemoryMgr(mContext),
  					GetMaxBase64EncodedBufferSize(bufSize),
  					kPGPMemoryMgrFlags_None));
! 	if (encodedBuffer == (StPGPDataRef) 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	};
  	bufSize = Base64Encode(	static_cast<const PGPByte *>(buffer),
***************
*** 351,357 ****
  	buffer = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  												bufSize,
  												kPGPMemoryMgrFlags_None));
! 	if (buffer == 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	};
  	pgpErr = PGPFinalizeHash(hashContext, static_cast<char *>(buffer));
--- 351,357 ----
  	buffer = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  												bufSize,
  												kPGPMemoryMgrFlags_None));
! 	if (buffer == (StPGPDataRef) 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	};
  	pgpErr = PGPFinalizeHash(hashContext, static_cast<char *>(buffer));
***************
*** 400,406 ****
  	result = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  												resultSize + 1,
  												kPGPMemoryMgrFlags_None));
! 	if (result == 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	};
  	pgpCopyMemory(inResult, static_cast<char *>(result), resultSize + 1);
--- 400,406 ----
  	result = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  												resultSize + 1,
  												kPGPMemoryMgrFlags_None));
! 	if (result == (StPGPDataRef) 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	};
  	pgpCopyMemory(inResult, static_cast<char *>(result), resultSize + 1);
***************
*** 426,432 ****
  	decodedResult = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  														GetMaxBase64DecodedBufferSize(end - found),
  														kPGPMemoryMgrFlags_None));
! 	if (decodedResult == 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	};
  	
--- 426,432 ----
  	decodedResult = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  														GetMaxBase64DecodedBufferSize(end - found),
  														kPGPMemoryMgrFlags_None));
! 	if (decodedResult == (StPGPDataRef) 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	};
  	
***************
*** 470,476 ****
  	result = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  												GetMaxBase64DecodedBufferSize(end - found),
  												kPGPMemoryMgrFlags_None));
! 	if (result == 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	};
  	
--- 470,476 ----
  	result = static_cast<PGPByte *>(PGPNewData(	PGPGetContextMemoryMgr(mContext),
  												GetMaxBase64DecodedBufferSize(end - found),
  												kPGPMemoryMgrFlags_None));
! 	if (result == (StPGPDataRef) 0) {
  		ThrowPGPError_(kPGPError_OutOfMemory);
  	};