Skip to content
Snippets Groups Projects

Resolve "SMIME Support"

Merged lazarog98 requested to merge 232-smime-support into dev
Compare and Show latest version
5 files
+ 480
603
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -55,12 +55,15 @@ enum EncryptionState: Int16 {
public enum CryptoScheme {
case PGP
case SMIME
case UNKNOWN
var description: String {
switch self {
case .PGP:
return "PGP"
case .SMIME:
return "SMIME"
default:
return ""
}
@@ -78,6 +81,8 @@ public enum CryptoScheme {
switch self {
case CryptoScheme.PGP:
return 0
case CryptoScheme.SMIME:
return 1
case CryptoScheme.UNKNOWN:
return 99
}
@@ -91,6 +96,7 @@ public class CryptoObject {
let signatureState: SignatureState
var encryptionState: EncryptionState
let signKey: String?
let signedKeys: [String]
let encType: CryptoScheme
let passcode: String?
let signedAdrs: [String]
@@ -109,7 +115,6 @@ public class CryptoObject {
return nil
}
init(chiphertext: Data?, plaintext: String?, decryptedData: Data?, sigState: SignatureState, encState: EncryptionState, signKey: String?, encType: CryptoScheme, signedAdrs: [String]) {
self.chiphertext = chiphertext
self.plaintext = plaintext
@@ -120,5 +125,25 @@ public class CryptoObject {
self.encType = encType
self.passcode = nil
self.signedAdrs = signedAdrs
if signKey != nil
{
self.signedKeys = [signKey!]
}
else{
self.signedKeys = []
}
}
init(chiphertext: Data?, plaintext: String?, decryptedData: Data?, sigState: SignatureState, encState: EncryptionState, signKey: String?, encType: CryptoScheme, signedAdrs: [String], signedKeys: [String]) {
self.chiphertext = chiphertext
self.plaintext = plaintext
self.decryptedData = decryptedData
self.signatureState = sigState
self.encryptionState = encState
self.signKey = signKey
self.encType = encType
self.passcode = nil
self.signedAdrs = signedAdrs
self.signedKeys = signedKeys
}
}
Loading