Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(601)

Side by Side Diff: openssl/ssl/ssl_txt.c

Issue 59083010: third_party/openssl: add ChaCha20+Poly1305 support. Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « openssl/ssl/ssl_locl.h ('k') | openssl/ssl/t1_enc.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* ssl/ssl_txt.c */ 1 /* ssl/ssl_txt.c */
2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 if (BIO_dump_indent(bp, (char *)x->tlsext_tick, x->tlsext_tickle n, 4) <= 0) 209 if (BIO_dump_indent(bp, (char *)x->tlsext_tick, x->tlsext_tickle n, 4) <= 0)
210 goto err; 210 goto err;
211 } 211 }
212 #endif 212 #endif
213 213
214 #ifndef OPENSSL_NO_COMP 214 #ifndef OPENSSL_NO_COMP
215 if (x->compress_meth != 0) 215 if (x->compress_meth != 0)
216 { 216 {
217 SSL_COMP *comp = NULL; 217 SSL_COMP *comp = NULL;
218 218
219 » » ssl_cipher_get_evp(x,NULL,NULL,NULL,NULL,&comp); 219 » » ssl_cipher_get_comp(x, &comp);
220 if (comp == NULL) 220 if (comp == NULL)
221 { 221 {
222 if (BIO_printf(bp,"\n Compression: %d",x->compress_me th) <= 0) goto err; 222 if (BIO_printf(bp,"\n Compression: %d",x->compress_me th) <= 0) goto err;
223 } 223 }
224 else 224 else
225 { 225 {
226 if (BIO_printf(bp,"\n Compression: %d (%s)", comp->id ,comp->method->name) <= 0) goto err; 226 if (BIO_printf(bp,"\n Compression: %d (%s)", comp->id ,comp->method->name) <= 0) goto err;
227 } 227 }
228 } 228 }
229 #endif 229 #endif
230 if (x->time != 0L) 230 if (x->time != 0L)
231 { 231 {
232 if (BIO_printf(bp, "\n Start Time: %ld",x->time) <= 0) goto e rr; 232 if (BIO_printf(bp, "\n Start Time: %ld",x->time) <= 0) goto e rr;
233 } 233 }
234 if (x->timeout != 0L) 234 if (x->timeout != 0L)
235 { 235 {
236 if (BIO_printf(bp, "\n Timeout : %ld (sec)",x->timeout) <= 0) goto err; 236 if (BIO_printf(bp, "\n Timeout : %ld (sec)",x->timeout) <= 0) goto err;
237 } 237 }
238 if (BIO_puts(bp,"\n") <= 0) goto err; 238 if (BIO_puts(bp,"\n") <= 0) goto err;
239 239
240 if (BIO_puts(bp, " Verify return code: ") <= 0) goto err; 240 if (BIO_puts(bp, " Verify return code: ") <= 0) goto err;
241 if (BIO_printf(bp, "%ld (%s)\n", x->verify_result, 241 if (BIO_printf(bp, "%ld (%s)\n", x->verify_result,
242 X509_verify_cert_error_string(x->verify_result)) <= 0) goto err; 242 X509_verify_cert_error_string(x->verify_result)) <= 0) goto err;
243 243
244 return(1); 244 return(1);
245 err: 245 err:
246 return(0); 246 return(0);
247 } 247 }
248 248
OLDNEW
« no previous file with comments | « openssl/ssl/ssl_locl.h ('k') | openssl/ssl/t1_enc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698