open-eid · metsma · Jan 28, 2025
diff --git a/CryptoLib/CryptoLib.xcodeproj/project.pbxproj b/CryptoLib/CryptoLib.xcodeproj/project.pbxproj
@@ -16,14 +16,13 @@
 		39266A6320CFE3D4002E3F23 /* CdocParserDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 39266A6220CFE3D4002E3F23 /* CdocParserDelegate.m */; };
 		39266A6420CFE63D002E3F23 /* CdocParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 39266A5B20CFDC41002E3F23 /* CdocParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		39266A6520CFE643002E3F23 /* CdocInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 39266A6020CFDCDF002E3F23 /* CdocInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		393B66BC20D8F361001DC89B /* AbstractSmartToken.mm in Sources */ = {isa = PBXBuildFile; fileRef = 393B66BB20D8F361001DC89B /* AbstractSmartToken.mm */; };
 		393B66E020DB94B4001DC89B /* cdoc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 393B66DF20DB94B4001DC89B /* cdoc.framework */; };
 		3960E50520C02E5900D4D2FC /* CryptoDataFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 3960E50420C02E5900D4D2FC /* CryptoDataFile.m */; };
 		3960E50620C044EE00D4D2FC /* CryptoDataFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3960E50320C02DA400D4D2FC /* CryptoDataFile.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		39852A4B20AB2418004CB100 /* Decrypt.h in Headers */ = {isa = PBXBuildFile; fileRef = 39852A4120AB2418004CB100 /* Decrypt.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		39852A4C20AB2418004CB100 /* Encrypt.h in Headers */ = {isa = PBXBuildFile; fileRef = 39852A4220AB2418004CB100 /* Encrypt.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		39852A5020AB2418004CB100 /* DdocParserDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 39852A4620AB2418004CB100 /* DdocParserDelegate.m */; };
-		39852A5120AB2418004CB100 /* SmartCardTokenWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 39852A4720AB2418004CB100 /* SmartCardTokenWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		39852A5120AB2418004CB100 /* SmartCardTokenWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 39852A4720AB2418004CB100 /* SmartCardTokenWrapper.h */; };
 		39852A5220AB2418004CB100 /* Decrypt.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39852A4820AB2418004CB100 /* Decrypt.mm */; };
 		39852A5320AB2418004CB100 /* Encrypt.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39852A4920AB2418004CB100 /* Encrypt.mm */; };
 		39852A5420AB2418004CB100 /* DdocParserDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 39852A4A20AB2418004CB100 /* DdocParserDelegate.h */; };
@@ -72,7 +71,6 @@
 		39266A6020CFDCDF002E3F23 /* CdocInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CdocInfo.h; sourceTree = "<group>"; };
 		39266A6120CFE36A002E3F23 /* CdocParserDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CdocParserDelegate.h; sourceTree = "<group>"; };
 		39266A6220CFE3D4002E3F23 /* CdocParserDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CdocParserDelegate.m; sourceTree = "<group>"; };
-		393B66BB20D8F361001DC89B /* AbstractSmartToken.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AbstractSmartToken.mm; sourceTree = "<group>"; };
 		393B66DF20DB94B4001DC89B /* cdoc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = cdoc.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3960E50320C02DA400D4D2FC /* CryptoDataFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CryptoDataFile.h; sourceTree = "<group>"; };
 		3960E50420C02E5900D4D2FC /* CryptoDataFile.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CryptoDataFile.m; sourceTree = "<group>"; };
@@ -155,7 +153,6 @@
 				39231FAE20AB1C6C00E1E2B4 /* Info.plist */,
 				39231FAD20AB1C6C00E1E2B4 /* CryptoLib.h */,
 				39266A5920CFD93E002E3F23 /* AbstractSmartToken.h */,
-				393B66BB20D8F361001DC89B /* AbstractSmartToken.mm */,
 				39266A5E20CFDCB9002E3F23 /* CdocInfo.m */,
 				39266A6020CFDCDF002E3F23 /* CdocInfo.h */,
 				4E01B4A62AEFDD3B00941723 /* build-cdoc.sh */,
@@ -332,7 +329,6 @@
 				39E2B4DA20AD7A3400CA74A8 /* OpenLdap.m in Sources */,
 				39266A6320CFE3D4002E3F23 /* CdocParserDelegate.m in Sources */,
 				39266A5D20CFDC59002E3F23 /* CdocParser.m in Sources */,
-				393B66BC20D8F361001DC89B /* AbstractSmartToken.mm in Sources */,
 				3960E50520C02E5900D4D2FC /* CryptoDataFile.m in Sources */,
 				39E2B4DB20AD7A3400CA74A8 /* AttributeSet.m in Sources */,
 				DF8FEACA233239690020DED4 /* MoppLdapConfiguration.m in Sources */,
@@ -364,7 +360,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -397,7 +393,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -421,7 +417,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -453,7 +449,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

diff --git a/CryptoLib/CryptoLib/AbstractSmartToken.h b/CryptoLib/CryptoLib/AbstractSmartToken.h
@@ -22,10 +22,8 @@
 
 #import <Foundation/Foundation.h>
 
-@interface AbstractSmartToken : NSObject
+@protocol AbstractSmartToken
 - (NSData*)getCertificate;
 - (NSData*)decrypt:(NSData*)data pin1:(NSString *)pin1;
 - (NSData*)derive:(NSData*)data pin1:(NSString *)pin1;
 @end
-
-
diff --git a/CryptoLib/CryptoLib/AbstractSmartToken.mm b/CryptoLib/CryptoLib/AbstractSmartToken.mm
diff --git a/CryptoLib/CryptoLib/Decrypt.h b/CryptoLib/CryptoLib/Decrypt.h
@@ -20,26 +20,10 @@
  *
  */
 
+#import <Foundation/Foundation.h>
 
-#ifndef CdocWriter_h
-#define CdocWriter_h
-
-
-#endif /* CdocWriter_h */
+@protocol AbstractSmartToken;
 
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import "SmartCardTokenWrapper.h"
-#import "AbstractSmartToken.h"
-#if __cplusplus
-#import "cdoc/CdocReader.h"
-#endif
 @interface Decrypt : NSObject
-
-- (NSMutableDictionary *)decryptFile: (NSString *)fullPath withPin :(NSString *) pin withToken :(AbstractSmartToken *) smartToken;
+- (NSMutableDictionary *)decryptFile:(NSString *)fullPath withPin:(NSString *)pin withToken:(id<AbstractSmartToken>)smartToken;
 @end
-
-
-
-
-
diff --git a/CryptoLib/CryptoLib/Decrypt.mm b/CryptoLib/CryptoLib/Decrypt.mm
@@ -23,14 +23,14 @@
 #import "Decrypt.h"
 #import "cdoc/CdocReader.h"
 #import "cdoc/Token.h"
+#import "AbstractSmartToken.h"
 #import "SmartCardTokenWrapper.h"
 #import "DdocParserDelegate.h"
-#import <UIKit/UIKit.h>
 
 @implementation Decrypt
 
-- (NSMutableDictionary *)decryptFile: (NSString *)fullPath withPin :(NSString *) pin withToken :(AbstractSmartToken *) smartToken {
-    
+- (NSMutableDictionary *)decryptFile:(NSString *)fullPath withPin:(NSString *)pin withToken:(id<AbstractSmartToken>)smartToken {
+
     std::string encodedFullPath = std::string([fullPath UTF8String]);
     std::string encodedPin = std::string([pin UTF8String]);
     CDOCReader cdocReader(encodedFullPath);

diff --git a/CryptoLib/CryptoLib/SmartCardTokenWrapper.h b/CryptoLib/CryptoLib/SmartCardTokenWrapper.h
@@ -1,5 +1,5 @@
 //
-//  ApduToken.hpp
+//  SmartCardTokenWrapper.hpp
 //  CryptoLib
 /*
  * Copyright 2017 - 2024 Riigi Infosüsteemi Amet
@@ -20,29 +20,31 @@
  *
  */
 
-
-
 #if __cplusplus
+
 #import "cdoc/Token.h"
 
-#include <stdio.h>
-#import "AbstractSmartToken.h"
+#import <Foundation/Foundation.h>
 
-#import <UIKit/UIKit.h>
+#include <memory>
 
-class  SmartCardTokenWrapper: public Token
+@protocol AbstractSmartToken;
+
+class SmartCardTokenWrapper: public Token
 {
 public:
-    SmartCardTokenWrapper(const std::string &password,  AbstractSmartToken *smartToken);
-    SmartCardTokenWrapper();
+    SmartCardTokenWrapper(const std::string &password, id<AbstractSmartToken> smartToken);
+    ~SmartCardTokenWrapper() noexcept;
     virtual std::vector<uchar> cert() const override;
     virtual std::vector<uchar> decrypt(const std::vector<uchar> &data) const override;
     virtual std::vector<uchar> derive(const std::vector<uchar> &publicKey) const override;
-
+
+    Token* selfPtr() { return this; }
+
 private:
     class Private;
-    Private *token;
-    std::vector<uchar> encodeData(const NSData *dataBlock) const;
+    std::unique_ptr<Private> token;
+    static std::vector<uchar> encodeData(const NSData *dataBlock);
 };
 
 #endif
diff --git a/CryptoLib/CryptoLib/SmartCardTokenWrapper.mm b/CryptoLib/CryptoLib/SmartCardTokenWrapper.mm
@@ -23,57 +23,38 @@
 
 #include "SmartCardTokenWrapper.h"
 
-#import "cdoc/Token.h"
-#import <UIKit/UIKit.h>
-#import "AbstractSmartToken.h"
-#include <iostream>
+#import <CryptoLib/AbstractSmartToken.h>
 
 class SmartCardTokenWrapper::Private{
 public:
-    std::vector<uchar> certResponse;
-    std::vector<uchar> decryptResponse;
-    AbstractSmartToken *smartTokenClass;
-    std::string pin1;
+    id<AbstractSmartToken> smartTokenClass;
+    NSString *pin1;
 };
 
 
-SmartCardTokenWrapper::SmartCardTokenWrapper(const std::string &password,  AbstractSmartToken *smartToken)
+SmartCardTokenWrapper::SmartCardTokenWrapper(const std::string &password, id<AbstractSmartToken> smartToken)
 : token(new Private) {
-    token->pin1 = password;
+    token->pin1 = [NSString stringWithUTF8String:password.c_str()];
     token->smartTokenClass = smartToken;
 }
 
-std::vector<uchar> SmartCardTokenWrapper::cert() const{
-    NSData *certDataBlock = [token->smartTokenClass getCertificate];
-    token->certResponse = this->encodeData(certDataBlock);
-    return token->certResponse;
+SmartCardTokenWrapper::~SmartCardTokenWrapper() noexcept = default;
+
+std::vector<uchar> SmartCardTokenWrapper::cert() const {
+    return encodeData([token->smartTokenClass getCertificate]);
 }
 
-std::vector<uchar> SmartCardTokenWrapper::decrypt(const std::vector<uchar> &data) const{
+std::vector<uchar> SmartCardTokenWrapper::decrypt(const std::vector<uchar> &data) const {
     NSMutableData *nsdata = [NSMutableData dataWithBytesNoCopy:(void *)data.data() length:data.size() freeWhenDone:0];
-    NSString* pin1Encoded = [NSString stringWithUTF8String:token->pin1.c_str()];
-    NSData *dataBlock = [token->smartTokenClass decrypt:nsdata pin1:pin1Encoded];
-
-    token->decryptResponse = this->encodeData(dataBlock);
-
-    return token->decryptResponse;
+    return encodeData([token->smartTokenClass decrypt:nsdata pin1:token->pin1]);
 }
 
-std::vector<uchar> SmartCardTokenWrapper::derive(const std::vector<uchar> &publicKey) const{
+std::vector<uchar> SmartCardTokenWrapper::derive(const std::vector<uchar> &publicKey) const {
     NSMutableData *nsdata = [NSMutableData dataWithBytesNoCopy:(void *)publicKey.data() length:publicKey.size() freeWhenDone:0];
-    NSString* pin1Encoded = [NSString stringWithUTF8String:token->pin1.c_str()];
-    NSData *dataBlock = [token->smartTokenClass derive:nsdata pin1:pin1Encoded];
-
-    token->decryptResponse = this->encodeData(dataBlock);
-    return token->decryptResponse;
+    return encodeData([token->smartTokenClass derive:nsdata pin1:token->pin1]);
 }
 
-std::vector<uchar> SmartCardTokenWrapper::encodeData(const NSData *dataBlock) const{
-    unsigned char *buffer = reinterpret_cast<unsigned char*>(const_cast<void*>(dataBlock.bytes));
-    return std::vector<uchar>(buffer, buffer + dataBlock.length);
+std::vector<uchar> SmartCardTokenWrapper::encodeData(const NSData *dataBlock) {
+    const unsigned char *buffer = reinterpret_cast<const unsigned char*>(dataBlock.bytes);
+    return {buffer, std::next(buffer, dataBlock.length)};
 }
-
-SmartCardTokenWrapper::SmartCardTokenWrapper()
-{
-}
-
diff --git a/CryptoLib/CryptoLib/build-cdoc.sh b/CryptoLib/CryptoLib/build-cdoc.sh
@@ -14,8 +14,8 @@ cmake \
     -DCMAKE_OSX_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET} \
     -DBUILD_SHARED_LIBS=YES \
     -DOPENSSL_ROOT_DIR=${PROJECT_DIR}/../MoppLib/MoppLib/libdigidocpp/libdigidocpp.${PLATFORM_NAME} \
-    -DSWIG_DIR=NOTFOUND \
-    -DDOXYGEN_EXECUTABLE=NOTFOUND \
+    -DCMAKE_DISABLE_FIND_PACKAGE_SWIG=YES \
+    -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=YES \
     -S ${SOURCE_DIR} -B ${TARGET_TEMP_DIR}
 cmake --build ${TARGET_TEMP_DIR}
 cmake --install ${TARGET_TEMP_DIR}
diff --git a/MoppLib/MoppLib/SmartToken.h b/MoppLib/MoppLib/SmartToken.h
@@ -20,9 +20,9 @@
  *
  */
 
-#import <Foundation/Foundation.h>
-#import "CryptoLib/AbstractSmartToken.h"
-@interface SmartToken : AbstractSmartToken
+#import <CryptoLib/AbstractSmartToken.h>
+
+@interface SmartToken : NSObject<AbstractSmartToken>
 - (NSData*)getCertificate;
 - (NSData*)decrypt:(NSData*)data pin1:(NSString *)pin1;
 - (NSData*)derive:(NSData*)data pin1:(NSString *)pin1;

diff --git a/MoppLib/MoppLib/SmartToken.m b/MoppLib/MoppLib/SmartToken.m
@@ -20,7 +20,6 @@
  *
  */
 
-#import <Foundation/Foundation.h>
 #import "SmartToken.h"
 #import "CardActionsManager.h"
 #import "MoppLibError.h"