diff options
author | beck <> | 2016-11-04 18:07:24 +0000 |
---|---|---|
committer | beck <> | 2016-11-04 18:07:24 +0000 |
commit | 3b8a78795bef4ca09dc876e28a533d702bf5275d (patch) | |
tree | 19909c3874aacc91f295043d55b118a7fe7567e8 /src/lib/libcrypto/x509 | |
parent | 145c17d7875703f3317c0294c215fc4aa38911a8 (diff) | |
download | openbsd-3b8a78795bef4ca09dc876e28a533d702bf5275d.tar.gz openbsd-3b8a78795bef4ca09dc876e28a533d702bf5275d.tar.bz2 openbsd-3b8a78795bef4ca09dc876e28a533d702bf5275d.zip |
make public ASN1_time_parse and ASN1_time_tm_cmp to replace former hidden
functions.. document with a man page.
bump majors on libtls, libssl, libcrypto
ok jsing@ guenther@
Diffstat (limited to 'src/lib/libcrypto/x509')
-rw-r--r-- | src/lib/libcrypto/x509/vpm_int.h | 0 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_lcl.h | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.c | 6 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libcrypto/x509/vpm_int.h b/src/lib/libcrypto/x509/vpm_int.h new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/src/lib/libcrypto/x509/vpm_int.h | |||
diff --git a/src/lib/libcrypto/x509/x509_lcl.h b/src/lib/libcrypto/x509/x509_lcl.h index 9ffdd01e61..b16df78ad7 100644 --- a/src/lib/libcrypto/x509/x509_lcl.h +++ b/src/lib/libcrypto/x509/x509_lcl.h | |||
@@ -57,5 +57,3 @@ | |||
57 | */ | 57 | */ |
58 | 58 | ||
59 | int x509_check_cert_time(X509_STORE_CTX *ctx, X509 *x, int quiet); | 59 | int x509_check_cert_time(X509_STORE_CTX *ctx, X509 *x, int quiet); |
60 | int asn1_time_parse(const char *, size_t, struct tm *, int); | ||
61 | int asn1_tm_cmp(struct tm *tm1, struct tm *tm2); | ||
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c index a9330e1c03..7a6d272023 100644 --- a/src/lib/libcrypto/x509/x509_vfy.c +++ b/src/lib/libcrypto/x509/x509_vfy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_vfy.c,v 1.50 2016/10/02 20:45:04 guenther Exp $ */ | 1 | /* $OpenBSD: x509_vfy.c,v 1.51 2016/11/04 18:07:23 beck Exp $ */ |
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 | * |
@@ -1658,7 +1658,7 @@ X509_cmp_time(const ASN1_TIME *ctm, time_t *cmp_time) | |||
1658 | 1658 | ||
1659 | memset(&tm1, 0, sizeof(tm1)); | 1659 | memset(&tm1, 0, sizeof(tm1)); |
1660 | 1660 | ||
1661 | type = asn1_time_parse(ctm->data, ctm->length, &tm1, ctm->type); | 1661 | type = ASN1_time_parse(ctm->data, ctm->length, &tm1, ctm->type); |
1662 | if (type == -1) | 1662 | if (type == -1) |
1663 | goto out; /* invalid time */ | 1663 | goto out; /* invalid time */ |
1664 | 1664 | ||
@@ -1679,7 +1679,7 @@ X509_cmp_time(const ASN1_TIME *ctm, time_t *cmp_time) | |||
1679 | if (gmtime_r(&time2, &tm2) == NULL) | 1679 | if (gmtime_r(&time2, &tm2) == NULL) |
1680 | goto out; | 1680 | goto out; |
1681 | 1681 | ||
1682 | ret = asn1_tm_cmp(&tm1, &tm2); | 1682 | ret = ASN1_time_tm_cmp(&tm1, &tm2); |
1683 | if (ret == 0) | 1683 | if (ret == 0) |
1684 | ret = -1; /* 0 is used for error, so map same to less than */ | 1684 | ret = -1; /* 0 is used for error, so map same to less than */ |
1685 | out: | 1685 | out: |