Skip to content

Fix a year-2038-problem #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmwiedemann wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

Fix a year-2038-problem #144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/modules/copy/delegation/delegation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ SOAP_NMAC struct Namespace namespaces[] =
};

// Timestamp from ASN1 representation
static int get_timestamp_from_asn1(ASN1_TIME* asn1)
static long long get_timestamp_from_asn1(ASN1_TIME* asn1)
{
char* data = (char*) ASN1_STRING_data(asn1);
size_t len = strlen(data);
Expand Down Expand Up @@ -88,7 +88,7 @@ static int get_timestamp_from_asn1(ASN1_TIME* asn1)
}

// Remaining lifetime from the given certificate
static int get_cert_remaining_life(const std::string& cert)
static long long get_cert_remaining_life(const std::string& cert)
{
FILE* f = fopen(cert.c_str(), "r");
if (f == NULL)
Expand All @@ -99,7 +99,7 @@ static int get_cert_remaining_life(const std::string& cert)
return 0;

ASN1_TIME* expiration = X509_get_notAfter(x509_cert);
int expiration_timestamp = get_timestamp_from_asn1(expiration);
long long expiration_timestamp = get_timestamp_from_asn1(expiration);
X509_free(x509_cert);

return (expiration_timestamp - time(NULL)) / 60;
Expand Down Expand Up @@ -145,8 +145,8 @@ bool DavixDelegation::get_credentials(const Davix::RequestParams& params,
capath = capathList[0];

// Delegation lifetime (in minutes!)
int cert_remaining_life = get_cert_remaining_life(ucert);
int delegation_max_life = 12 * 60; // 12 hours
long long cert_remaining_life = get_cert_remaining_life(ucert);
long long delegation_max_life = 12 * 60; // 12 hours

// Delegated proxy lifetime should be shorter than the current lifetime!
*lifetime = std::min(cert_remaining_life, delegation_max_life) - 1;
Expand Down