diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/ssl_asn1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c index 94fc8685fc..cea2b31f47 100644 --- a/src/lib/libssl/ssl_asn1.c +++ b/src/lib/libssl/ssl_asn1.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_asn1.c,v 1.57 2018/08/27 16:42:48 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_asn1.c,v 1.58 2021/03/29 18:24:04 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2016 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2016 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -331,7 +331,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length) | |||
| 331 | goto err; | 331 | goto err; |
| 332 | if (timeout != 0) | 332 | if (timeout != 0) |
| 333 | s->timeout = (long)timeout; | 333 | s->timeout = (long)timeout; |
| 334 | 334 | ||
| 335 | /* Peer certificate [3]. */ | 335 | /* Peer certificate [3]. */ |
| 336 | X509_free(s->peer); | 336 | X509_free(s->peer); |
| 337 | s->peer = NULL; | 337 | s->peer = NULL; |
| @@ -383,7 +383,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length) | |||
| 383 | if (!CBS_strdup(&hostname, &s->tlsext_hostname)) | 383 | if (!CBS_strdup(&hostname, &s->tlsext_hostname)) |
| 384 | goto err; | 384 | goto err; |
| 385 | } | 385 | } |
| 386 | 386 | ||
| 387 | /* PSK identity hint [7]. */ | 387 | /* PSK identity hint [7]. */ |
| 388 | /* PSK identity [8]. */ | 388 | /* PSK identity [8]. */ |
| 389 | 389 | ||
| @@ -421,7 +421,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length) | |||
| 421 | 421 | ||
| 422 | return (s); | 422 | return (s); |
| 423 | 423 | ||
| 424 | err: | 424 | err: |
| 425 | ERR_asprintf_error_data("offset=%d", (int)(CBS_data(&cbs) - *pp)); | 425 | ERR_asprintf_error_data("offset=%d", (int)(CBS_data(&cbs) - *pp)); |
| 426 | 426 | ||
| 427 | if (s != NULL && (a == NULL || *a != s)) | 427 | if (s != NULL && (a == NULL || *a != s)) |
