nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-04-05 17:08:05 -05:00
Code Issues Projects Releases Wiki Activity

Simplified ASN1_GetTimeT()

Browse Source 
This commit also drops support for OpenSSL 1.1.0
(end of life for that release was August 31, 2018).
This commit is contained in:
Michal Trojnara 2020-06-07 17:54:10 +02:00
parent 772a878182
commit 0c9f53d30c
2 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -93,17 +93,17 @@ AS_IF([test "x$have_gsf" = "xyes"],
PKG_CHECK_MODULES( PKG_CHECK_MODULES(
[OPENSSL], [OPENSSL],
[libcrypto >= 1.1.0], [libcrypto >= 1.1.1],
, ,
[PKG_CHECK_MODULES( [PKG_CHECK_MODULES(
[OPENSSL], [OPENSSL],
[openssl >= 1.1.0], [openssl >= 1.1.1],
, ,
[AC_CHECK_LIB( [AC_CHECK_LIB(
[crypto], [crypto],
[EVP_MD_CTX_new], [EVP_MD_CTX_new],
[OPENSSL_LIBS="-lcrypto ${SOCKETS_LIBS} ${DL_LIBS}"], [OPENSSL_LIBS="-lcrypto ${SOCKETS_LIBS} ${DL_LIBS}"],
[AC_MSG_ERROR([OpenSSL 1.1.0 or later is required. https://www.openssl.org/])], [AC_MSG_ERROR([OpenSSL 1.1.1 or later is required. https://www.openssl.org/])],
[${DL_LIBS}] [${DL_LIBS}]
)] )]
)] )]

40
osslsigncode.c
View File

@ -1679,41 +1679,15 @@ static int print_time(const ASN1_TIME *time)
return 1; /* OK */ return 1; /* OK */
} }
static time_t ASN1_GetTimeT(ASN1_TIME *time) static time_t ASN1_GetTimeT(ASN1_TIME *s)
{ {
struct tm t; struct tm tm;
const char *str;
size_t i = 0;
str = (const char*) time->data; if (ASN1_TIME_to_tm(s, &tm)) {
memset(&t, 0, sizeof(t)); return mktime(&tm);
if (time->type == V_ASN1_UTCTIME) { } else {
/* two digit year */ return INVALID_TIME;
t.tm_year = (str[i++] - '0') * 10;
t.tm_year += (str[i++] - '0');
if (t.tm_year < 70)
t.tm_year += 100;
} else if (time->type == V_ASN1_GENERALIZEDTIME) {
/* four digit year */
t.tm_year = (str[i++] - '0') * 1000;
t.tm_year+= (str[i++] - '0') * 100;
t.tm_year+= (str[i++] - '0') * 10;
t.tm_year+= (str[i++] - '0');
t.tm_year -= 1900;
} }
t.tm_mon = (str[i++] - '0') * 10;
t.tm_mon += (str[i++] - '0') - 1; /* -1 since January is 0 not 1 */
t.tm_mday = (str[i++] - '0') * 10;
t.tm_mday+= (str[i++] - '0');
t.tm_hour = (str[i++] - '0') * 10;
t.tm_hour+= (str[i++] - '0');
t.tm_min = (str[i++] - '0') * 10;
t.tm_min += (str[i++] - '0');
t.tm_sec = (str[i++] - '0') * 10;
t.tm_sec += (str[i++] - '0');
/* Note: we did not adjust the time based on time zone information */
return mktime(&t);
} }
static int print_cert(X509 *cert, int i) static int print_cert(X509 *cert, int i)
@ -2366,7 +2340,7 @@ static int verify_pkcs7(PKCS7 *p7, GLOBAL_OPTIONS *options)
PKCS7 *tmstamp_p7 = NULL; PKCS7 *tmstamp_p7 = NULL;
CMS_ContentInfo *tmstamp_cms = NULL; CMS_ContentInfo *tmstamp_cms = NULL;
int ret = 0, leafok = 0; int ret = 0, leafok = 0;
time_t timestamp_time = INVALID_TIME;; time_t timestamp_time = INVALID_TIME;
if (!find_signer(p7, options->leafhash, &leafok)) if (!find_signer(p7, options->leafhash, &leafok))
printf("Find signers error\n"); printf("Find signers error\n");