From 7ddc70de0ad79b714e368a377ccb14e249cbada0 Mon Sep 17 00:00:00 2001
From: Justin Karneges <justin@affinix.com>
Date: Fri, 1 Jun 2007 18:47:50 +0000
Subject: [PATCH] remove CRL::signature, for consistency with other objects
svn path=/trunk/kdesupport/qca/; revision=670496
---
TODO | 1 -
include/QtCrypto/qca_cert.h | 5 -----
src/qca_cert.cpp | 10 ++++------
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/TODO b/TODO
index 2b601d22..53bd16f7 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,6 @@
deinit method for providers, to occur for all before destruction?
securemessage bytesWritten?
Provider::version -> qcaVersion, make version() provider's own version?
- remove CRL::signature? (we don't have this for cert/csr)
ensure non-default ctors/dtors/copy/op=, and dpointers as needed:
basic,publickey,cert,keystore,securelayer,securemessage
QCA_EXPORT check:
diff --git a/include/QtCrypto/qca_cert.h b/include/QtCrypto/qca_cert.h
index fcb50a54..6e103609 100644
--- a/include/QtCrypto/qca_cert.h
+++ b/include/QtCrypto/qca_cert.h
@@ -1287,11 +1287,6 @@ namespace QCA
*/
QList<CRLEntry> revoked() const;
- /**
- The signature on this CRL
- */
- SecureArray signature() const;
-
/**
The signature algorithm used for the signature on this CRL
*/
diff --git a/src/qca_cert.cpp b/src/qca_cert.cpp
index a84dd8cb..9cc34edb 100644
--- a/src/qca_cert.cpp
+++ b/src/qca_cert.cpp
@@ -1627,11 +1627,6 @@ QList<CRLEntry> CRL::revoked() const
return static_cast<const CRLContext *>(context())->props()->revoked;
}
-SecureArray CRL::signature() const
-{
- return static_cast<const CRLContext *>(context())->props()->sig;
-}
-
SignatureAlgorithm CRL::signatureAlgorithm() const
{
return static_cast<const CRLContext *>(context())->props()->sigalgo;
@@ -1664,6 +1659,9 @@ bool CRL::operator==(const CRL &otherCrl) const
return false;
}
+ const CRLContextProps *a = static_cast<const CRLContext *>(context())->props();
+ const CRLContextProps *b = static_cast<const CRLContext *>(otherCrl.context())->props();
+
if ( number() != otherCrl.number() )
return false;
@@ -1673,7 +1671,7 @@ bool CRL::operator==(const CRL &otherCrl) const
if ( nextUpdate() != otherCrl.nextUpdate() )
return false;
- if ( signature() != otherCrl.signature() )
+ if ( a->sig != b->sig )
return false;
if ( signatureAlgorithm() != otherCrl.signatureAlgorithm() )