projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix to allow re-writing of SMPTE subtitles.
[libdcp.git]
/
src
/
certificate.cc
diff --git
a/src/certificate.cc
b/src/certificate.cc
index 6edf4f4c87b175a6e605c2cb4bd67b0ec707fb48..2e33907d2e2f1dfd694866e480aa322f160aa832 100644
(file)
--- a/
src/certificate.cc
+++ b/
src/certificate.cc
@@
-354,6
+354,8
@@
convert_time (ASN1_TIME const * time)
t.tm_year -= 1900;
}
t.tm_year -= 1900;
}
+ t.tm_mon--;
+
return t;
}
return t;
}
@@
-361,14
+363,22
@@
struct tm
Certificate::not_before () const
{
DCP_ASSERT (_certificate);
Certificate::not_before () const
{
DCP_ASSERT (_certificate);
+#if OPENSSL_VERSION_NUMBER > 0x10100000L
return convert_time(X509_get0_notBefore(_certificate));
return convert_time(X509_get0_notBefore(_certificate));
+#else
+ return convert_time(X509_get_notBefore(_certificate));
+#endif
}
struct tm
Certificate::not_after () const
{
DCP_ASSERT (_certificate);
}
struct tm
Certificate::not_after () const
{
DCP_ASSERT (_certificate);
+#if OPENSSL_VERSION_NUMBER > 0x10100000L
return convert_time(X509_get0_notAfter(_certificate));
return convert_time(X509_get0_notAfter(_certificate));
+#else
+ return convert_time(X509_get_notAfter(_certificate));
+#endif
}
string
}
string