From 3305c4fdc8845fc3d17ea1bd49548073bb9111fe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sat, 10 Jan 2015 00:37:34 +0100 Subject: [PATCH] chg: Replace ASN1_UTCTIME by ASN1_TIME --- src/crypto/CRL.cpp | 18 +++++++++--------- src/crypto/CRL.h | 2 +- src/crypto/remoteSigner.cpp | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/crypto/CRL.cpp b/src/crypto/CRL.cpp index b7a69fe..7c3eb86 100644 --- a/src/crypto/CRL.cpp +++ b/src/crypto/CRL.cpp @@ -38,17 +38,17 @@ std::string CRL::revoke( std::string serial, std::string time ) { if( time != "" ) { const unsigned char* data = ( unsigned char* )( time.data() ); - d2i_ASN1_UTCTIME( &rev->revocationDate, &data, time.size() ); + d2i_ASN1_TIME( &rev->revocationDate, &data, time.size() ); } else { X509_REVOKED_set_revocationDate( rev, tmptm.get() ); } X509_CRL_add0_revoked( crl.get(), rev ); - int len = i2d_ASN1_UTCTIME( tmptm.get(), NULL ); + int len = i2d_ASN1_TIME( tmptm.get(), NULL ); unsigned char* buffer = ( unsigned char* ) OPENSSL_malloc( len ); unsigned char* pos = buffer; - i2d_ASN1_UTCTIME( tmptm.get(), &pos ); + i2d_ASN1_TIME( tmptm.get(), &pos ); std::string rettime = std::string( ( char* ) buffer, len ); OPENSSL_free( buffer ); return rettime; @@ -99,15 +99,15 @@ std::string CRL::toString() { std::string CRL::getSignature() { int len = i2d_X509_ALGOR( crl->sig_alg, NULL ); len += i2d_ASN1_BIT_STRING( crl->signature, NULL ); - len += i2d_ASN1_UTCTIME( crl->crl->lastUpdate, NULL ); - len += i2d_ASN1_UTCTIME( crl->crl->nextUpdate, NULL ); + len += i2d_ASN1_TIME( crl->crl->lastUpdate, NULL ); + len += i2d_ASN1_TIME( crl->crl->nextUpdate, NULL ); unsigned char* buffer = ( unsigned char* ) OPENSSL_malloc( len ); unsigned char* pos = buffer; i2d_X509_ALGOR( crl->sig_alg, &pos ); i2d_ASN1_BIT_STRING( crl->signature, &pos ); - i2d_ASN1_UTCTIME( crl->crl->lastUpdate, &pos ); - i2d_ASN1_UTCTIME( crl->crl->nextUpdate, &pos ); + i2d_ASN1_TIME( crl->crl->lastUpdate, &pos ); + i2d_ASN1_TIME( crl->crl->nextUpdate, &pos ); std::string res = std::string( ( char* ) buffer, len ); OPENSSL_free( buffer ); @@ -119,6 +119,6 @@ void CRL::setSignature( std::string signature ) { const unsigned char* buffer = data; d2i_X509_ALGOR( &crl->sig_alg, &buffer, signature.size() ); d2i_ASN1_BIT_STRING( &crl->signature, &buffer, signature.size() + data - buffer ); - d2i_ASN1_UTCTIME( &crl->crl->lastUpdate, &buffer, signature.size() + data - buffer ); - d2i_ASN1_UTCTIME( &crl->crl->nextUpdate, &buffer, signature.size() + data - buffer ); + d2i_ASN1_TIME( &crl->crl->lastUpdate, &buffer, signature.size() + data - buffer ); + d2i_ASN1_TIME( &crl->crl->nextUpdate, &buffer, signature.size() + data - buffer ); } diff --git a/src/crypto/CRL.h b/src/crypto/CRL.h index 4e3deb7..55c2c3f 100644 --- a/src/crypto/CRL.h +++ b/src/crypto/CRL.h @@ -15,7 +15,7 @@ public: * Adds the serial to this serial. * @param serial the serial to remove (as hex string) * @param time the "revokation time" (der-encoded) - * @returns DER-encoded UTCTIME of the revoked time + * @returns DER-encoded TIME of the revoked time */ std::string revoke( std::string serial, std::string time ); diff --git a/src/crypto/remoteSigner.cpp b/src/crypto/remoteSigner.cpp index bad2065..6073986 100644 --- a/src/crypto/remoteSigner.cpp +++ b/src/crypto/remoteSigner.cpp @@ -177,8 +177,8 @@ std::pair, std::string> RemoteSigner::revoke( std::shared_p case RecordHeader::SignerResult::REVOKED: { const unsigned char* buffer2 = ( const unsigned char* ) payload.data(); const unsigned char* pos = buffer2; - ASN1_UTCTIME* time = d2i_ASN1_UTCTIME( NULL, &pos, payload.size() ); - ASN1_UTCTIME_free( time ); + ASN1_TIME* time = d2i_ASN1_TIME( NULL, &pos, payload.size() ); + ASN1_TIME_free( time ); std::string rest = payload.substr( pos - buffer2 ); crl->revoke( serial, payload.substr( 0, pos - buffer2 ) ); crl->setSignature( rest ); -- 2.47.3