From 46e82e254e549e762015e36a2d65507416892e02 Mon Sep 17 00:00:00 2001
From: Christian Hohnstaedt <christian@hohnstaedt.de>
Date: Wed, 28 Feb 2024 21:04:52 +0100
Subject: [PATCH] Constify tokenInfo() and findUniqueID()

No functional change
---
 lib/pkcs11.cpp |  8 ++++----
 lib/pkcs11.h   | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/pkcs11.cpp b/lib/pkcs11.cpp
index 135191de..6aef7ae4 100644
--- a/lib/pkcs11.cpp
+++ b/lib/pkcs11.cpp
@@ -389,7 +389,7 @@ void pkcs11::initToken(const slotid &slot, unsigned char *pin, int pinlen,
 		pk11error(slot, "C_InitToken", rv);
 }
 
-tkInfo pkcs11::tokenInfo(const slotid &slot)
+tkInfo pkcs11::tokenInfo(const slotid &slot) const
 {
 	tkInfo ti;
 	CK_RV rv = tokenInfo(slot, &ti);
@@ -400,7 +400,7 @@ tkInfo pkcs11::tokenInfo(const slotid &slot)
 	return ti;
 }
 
-CK_RV pkcs11::tokenInfo(const slotid &slot, tkInfo *tkinfo)
+CK_RV pkcs11::tokenInfo(const slotid &slot, tkInfo *tkinfo) const
 {
 	CK_TOKEN_INFO token_info;
 	CK_RV rv;
@@ -452,7 +452,7 @@ int pkcs11::deleteObjects(QList<CK_OBJECT_HANDLE> objects)
 }
 
 #define ID_LEN 8
-pk11_attr_data pkcs11::findUniqueID(unsigned long oclass)
+pk11_attr_data pkcs11::findUniqueID(unsigned long oclass) const
 {
 	pk11_attr_data id(CKA_ID);
 	pk11_attr_ulong class_att(CKA_CLASS, oclass);
@@ -576,7 +576,7 @@ pk11_attr_data pkcs11::generateKey(QString name, unsigned long mech,
 	return new_id;
 }
 
-QList<CK_OBJECT_HANDLE> pkcs11::objectList(pk11_attlist &atts)
+QList<CK_OBJECT_HANDLE> pkcs11::objectList(pk11_attlist &atts) const
 {
 	CK_RV rv;
 	CK_OBJECT_HANDLE objects[256];
diff --git a/lib/pkcs11.h b/lib/pkcs11.h
index e9bffef3..c75ce1e3 100644
--- a/lib/pkcs11.h
+++ b/lib/pkcs11.h
@@ -115,9 +115,9 @@ class pkcs11
 		pkcs11();
 		~pkcs11();
 
-		CK_RV tokenInfo(const slotid &slot, tkInfo *tkinfo);
-		tkInfo tokenInfo(const slotid &slot);
-		tkInfo tokenInfo()
+		CK_RV tokenInfo(const slotid &slot, tkInfo *tkinfo) const;
+		tkInfo tokenInfo(const slotid &slot) const;
+		tkInfo tokenInfo() const
 		{
 			return tokenInfo(p11slot);
 		}
@@ -145,7 +145,7 @@ class pkcs11
 				   CK_OBJECT_HANDLE object);
 		void storeAttribute(pk11_attribute &attribute,
 				   CK_OBJECT_HANDLE object);
-		QList<CK_OBJECT_HANDLE> objectList(pk11_attlist &atts);
+		QList<CK_OBJECT_HANDLE> objectList(pk11_attlist &atts) const;
 		QString tokenLogin(QString name, bool so, bool force=false);
 		void getRandom();
 		void logout();
@@ -155,7 +155,7 @@ class pkcs11
 		void setPin(unsigned char *oldPin, unsigned long oldPinLen,
 			unsigned char *pin, unsigned long pinLen);
 		CK_OBJECT_HANDLE createObject(pk11_attlist &attrs);
-		pk11_attr_data findUniqueID(unsigned long oclass);
+		pk11_attr_data findUniqueID(unsigned long oclass) const;
 		pk11_attr_data generateKey(QString name,
 			unsigned long ec_rsa_mech, unsigned long bits, int nid);
 		int deleteObjects(QList<CK_OBJECT_HANDLE> objects);