summaryrefslogtreecommitdiff
path: root/src/lib/libtls
diff options
context:
space:
mode:
authorbeck <>2017-08-27 01:39:26 +0000
committerbeck <>2017-08-27 01:39:26 +0000
commitec59f338ce2a8842a8478c243e444aefb1459dfa (patch)
treed1b38b4c95049fecffbe49d28ff755942f4edad7 /src/lib/libtls
parent4d875aa977b8bbe9969527101d0f2d7d67a77b0b (diff)
downloadopenbsd-ec59f338ce2a8842a8478c243e444aefb1459dfa.tar.gz
openbsd-ec59f338ce2a8842a8478c243e444aefb1459dfa.tar.bz2
openbsd-ec59f338ce2a8842a8478c243e444aefb1459dfa.zip
Make the symbol for ASN1_time_tm_clamp_notafter visible so libtls
can get at it, so libtls can also deal with notafter's past the realm of 32 bit time in portable
Diffstat (limited to '')
-rw-r--r--src/lib/libtls/tls_conninfo.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libtls/tls_conninfo.c b/src/lib/libtls/tls_conninfo.c
index 87660fa989..e3820988e8 100644
--- a/src/lib/libtls/tls_conninfo.c
+++ b/src/lib/libtls/tls_conninfo.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_conninfo.c,v 1.15 2017/04/05 03:19:22 beck Exp $ */ 1/* $OpenBSD: tls_conninfo.c,v 1.16 2017/08/27 01:39:26 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2015 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2015 Bob Beck <beck@openbsd.org>
@@ -23,6 +23,8 @@
23#include <tls.h> 23#include <tls.h>
24#include "tls_internal.h" 24#include "tls_internal.h"
25 25
26int ASN1_time_tm_clamp_notafter(struct tm *tm);
27
26int 28int
27tls_hex_string(const unsigned char *in, size_t inlen, char **out, 29tls_hex_string(const unsigned char *in, size_t inlen, char **out,
28 size_t *outlen) 30 size_t *outlen)
@@ -121,6 +123,8 @@ tls_get_peer_cert_times(struct tls *ctx, time_t *notbefore,
121 goto err; 123 goto err;
122 if (ASN1_time_parse(after->data, after->length, &after_tm, 0) == -1) 124 if (ASN1_time_parse(after->data, after->length, &after_tm, 0) == -1)
123 goto err; 125 goto err;
126 if (!ASN1_time_tm_clamp_notafter(&after_tm))
127 goto err;
124 if ((*notbefore = timegm(&before_tm)) == -1) 128 if ((*notbefore = timegm(&before_tm)) == -1)
125 goto err; 129 goto err;
126 if ((*notafter = timegm(&after_tm)) == -1) 130 if ((*notafter = timegm(&after_tm)) == -1)