mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
Sergey Abramchuk
e2ad2ab5d5
git-subtree-dir: Sources/OpenVPNAdapter/Libraries/Vendors/openvpn git-subtree-split: 554d8b88817d3a7b836e78940ed61bb11ed2bd9b
56 lines
1.4 KiB
Diff
56 lines
1.4 KiB
Diff
From 62dd1588a7ec3501edfaf9470cf7a1ca15cb4ba1 Mon Sep 17 00:00:00 2001
|
|
From: Antonio Quartulli <antonio@openvpn.net>
|
|
Date: Tue, 20 Mar 2018 09:35:47 +0800
|
|
Subject: [PATCH] relax x509 date format check
|
|
|
|
Signed-off-by: Antonio Quartulli <antonio@openvpn.net>
|
|
---
|
|
library/x509.c | 18 +++++++++++++++++-
|
|
1 file changed, 17 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/library/x509.c b/library/x509.c
|
|
index 371d6da1..df2cea81 100644
|
|
--- a/library/x509.c
|
|
+++ b/library/x509.c
|
|
@@ -565,13 +565,20 @@ static int x509_parse_time( unsigned char **p, size_t len, size_t yearlen,
|
|
/*
|
|
* Parse seconds if present
|
|
*/
|
|
- if ( len >= 2 )
|
|
+ if ( len >= 2 && **p >= '0' && **p <= '9' )
|
|
{
|
|
CHECK( x509_parse_int( p, 2, &tm->sec ) );
|
|
len -= 2;
|
|
}
|
|
else
|
|
+ {
|
|
+#if defined(MBEDTLS_RELAXED_X509_DATE)
|
|
+ /* if relaxed mode, allow seconds to be absent */
|
|
+ tm->sec = 0;
|
|
+#else
|
|
return ( MBEDTLS_ERR_X509_INVALID_DATE );
|
|
+#endif
|
|
+ }
|
|
|
|
/*
|
|
* Parse trailing 'Z' if present
|
|
@@ -581,6 +588,15 @@ static int x509_parse_time( unsigned char **p, size_t len, size_t yearlen,
|
|
(*p)++;
|
|
len--;
|
|
}
|
|
+#if defined(MBEDTLS_RELAXED_X509_DATE)
|
|
+ else if ( len == 5 && **p == '+' )
|
|
+ {
|
|
+ int tz; /* throwaway timezone */
|
|
+ (*p)++;
|
|
+ CHECK( x509_parse_int( p, 4, &tz ) );
|
|
+ return 0;
|
|
+ }
|
|
+#endif
|
|
|
|
/*
|
|
* We should have parsed all characters at this point
|
|
--
|
|
2.16.2
|
|
|