174 BufAppendBase64L(b, *iCertificateChain[i]); |
174 BufAppendBase64L(b, *iCertificateChain[i]); |
175 BufAppendL(b, KReqCertEnd); |
175 BufAppendL(b, KReqCertEnd); |
176 } |
176 } |
177 BufAppendL(b, KReqCertChainEnd); |
177 BufAppendL(b, KReqCertChainEnd); |
178 } |
178 } |
179 |
179 |
180 if (iTrustedAuthorities.Count() > 0) |
180 if (iTrustedAuthorities.Count() > 0) |
181 { |
181 { |
182 BufAppendL(b, KReqTrustedAuthorities); |
182 BufAppendL(b, KReqTrustedAuthorities); |
183 for (i = 0; i < iTrustedAuthorities.Count(); i++) |
183 for (i = 0; i < iTrustedAuthorities.Count(); i++) |
184 { |
184 { |
185 BufAppendL(b, KReqTrustedRoot); |
185 BufAppendL(b, KReqTrustedRoot); |
186 BufAppendBase64L(b, *iTrustedAuthorities[i]); |
186 BufAppendBase64L(b, *iTrustedAuthorities[i]); |
187 BufAppendL(b, KReqTrustedRootEnd); |
187 BufAppendL(b, KReqTrustedRootEnd); |
188 } |
188 } |
189 BufAppendL(b, KReqTrustedAuthoritiesEnd); |
189 BufAppendL(b, KReqTrustedAuthoritiesEnd); |
190 } |
190 } |
191 |
191 |
192 if (iServerInfo) |
192 if (iServerInfo) |
193 { |
193 { |
194 BufAppendL(b, KReqServerInfo); |
194 BufAppendL(b, KReqServerInfo); |
195 BufAppendL(b, *iServerInfo); |
195 BufAppendL(b, *iServerInfo); |
196 BufAppendL(b, KReqServerInfoEnd); |
196 BufAppendL(b, KReqServerInfoEnd); |
197 } |
197 } |
198 |
198 |
199 if ((iDeviceDetailsManufacturer && |
199 if ((iDeviceDetailsManufacturer && |
200 iDeviceDetailsModel && |
200 iDeviceDetailsModel && |
201 iDeviceDetailsVersion) || |
201 iDeviceDetailsVersion) || |
202 iPeerKeyIdentifier.Length() || |
202 iPeerKeyIdentifier.Length() || |
203 iOcspResponderKeyId || |
203 iOcspResponderKeyId || |
204 iOcspInfoStored ) |
204 iOcspInfoStored ) |
205 { |
205 { |
206 BufAppendL(b, KReqExtensions); |
206 BufAppendL(b, KReqExtensions); |
207 } |
207 } |
208 |
208 |
209 if (iPeerKeyIdentifier.Length()) |
209 if (iPeerKeyIdentifier.Length()) |
210 { |
210 { |
211 BufAppendL(b, KReqPeerKey); |
211 BufAppendL(b, KReqPeerKey); |
212 BufAppendBase64L(b, iPeerKeyIdentifier); |
212 BufAppendBase64L(b, iPeerKeyIdentifier); |
213 BufAppendL(b, KReqPeerKeyEnd); |
213 BufAppendL(b, KReqPeerKeyEnd); |
214 } |
214 } |
215 |
215 |
216 if (iOcspInfoStored) |
216 if (iOcspInfoStored) |
217 { |
217 { |
218 BufAppendL(b, KReqNoOcspResponse); |
218 BufAppendL(b, KReqNoOcspResponse); |
219 } |
219 } |
220 |
220 |
221 if (iOcspResponderKeyId) |
221 if (iOcspResponderKeyId) |
222 { |
222 { |
223 BufAppendL(b, KReqOcspResponderKeyId); |
223 BufAppendL(b, KReqOcspResponderKeyId); |
224 BufAppendBase64L(b, *iOcspResponderKeyId); |
224 BufAppendBase64L(b, *iOcspResponderKeyId); |
225 BufAppendL(b, KReqOcspResponderKeyIdEnd); |
225 BufAppendL(b, KReqOcspResponderKeyIdEnd); |
226 } |
226 } |
227 |
227 |
228 if (iDeviceDetailsManufacturer != NULL && |
228 if (iDeviceDetailsManufacturer != NULL && |
229 iDeviceDetailsModel != NULL && |
229 iDeviceDetailsModel != NULL && |
230 iDeviceDetailsVersion != NULL) |
230 iDeviceDetailsVersion != NULL) |
231 { |
231 { |
232 BufAppendL(b, KReqDevDetails); |
232 BufAppendL(b, KReqDevDetails); |
235 BufAppendL(b, *iDeviceDetailsModel); |
235 BufAppendL(b, *iDeviceDetailsModel); |
236 BufAppendL(b, KReqDevDetailsVersion); |
236 BufAppendL(b, KReqDevDetailsVersion); |
237 BufAppendL(b, *iDeviceDetailsVersion); |
237 BufAppendL(b, *iDeviceDetailsVersion); |
238 BufAppendL(b, KReqDevDetailsEnd); |
238 BufAppendL(b, KReqDevDetailsEnd); |
239 } |
239 } |
240 |
240 |
241 if ((iDeviceDetailsManufacturer && |
241 if ((iDeviceDetailsManufacturer && |
242 iDeviceDetailsModel && |
242 iDeviceDetailsModel && |
243 iDeviceDetailsVersion) || |
243 iDeviceDetailsVersion) || |
244 iPeerKeyIdentifier.Length() || |
244 iPeerKeyIdentifier.Length() || |
245 iOcspResponderKeyId || |
245 iOcspResponderKeyId || |