update 2.1.0-SNAPSHOT

calypsonet · Jan 23, 2024 · bced6c1 · bced6c1
1 parent 9a4e28d
commit bced6c1
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 29 deletions.
diff --git a/2.1.0-SNAPSHOT/api_class_diagram.puml b/2.1.0-SNAPSHOT/api_class_diagram.puml
@@ -79,7 +79,6 @@ package "calypso.card" as calypsoCard {
     +<color:blue>PkiPersonalizationTransactionManager createPkiPersonalizationTransactionManager (<back:yellow>CardReader</back> cardReader, CalypsoCard card)
 
     +SearchCommandData createSearchCommandData ()
-    +<color:blue>CardCertParams createCardCertParams ()
 }
 +enum WriteAccessLevel <<green>> {
     PERSONALIZATION
@@ -302,19 +301,6 @@ package "transaction" as transaction {
         +<color:blue>PkiPersonalizationTransactionManager prepareLoadCardCert (byte[] cardCert)
         +<color:blue>PkiPersonalizationTransactionManager prepareLoadCaCert (byte[] caCert)
     }
-    +interface "<color:blue>CardCertParams" as CardCertParams <<blue>> {
-        +<color:blue>CardCertParams useExternalSigner (CardCertProviderSpi cardCertProviderSpi)
-        +<color:blue>CardCertParams useInternalSigner (CardCertificateFactory cardCertificateFactory, byte[] issuerKeyPriv, byte[] issuerKeyReference)
-
-        +<color:blue>CardCertParams useExistingCardKeyPair ()
-        +<color:blue>CardCertParams generateCardKeyPair ()
-        +<color:blue>CardCertParams useSpecificKeyPair (byte[] cardPriv, byte[] cardPub)
-
-        +<color:blue>CardCertParams setCardAidSize (int aidSize)
-        +<color:blue>CardCertParams setCardIndex (int cardIndex) ???
-        +<color:blue>CardCertParams setStartDate (int year, int month, int day)
-        +<color:blue>CardCertParams setEndDate (int year, int month, int day)
-    }
     +interface "SecureSymmetricCryptoTransactionManager" as SecureSymmetricCryptoTransactionManager<T extends SecureSymmetricCryptoTransactionManager<T>> extends SecureTransactionManager {
         +T prepareOpenSecureSession (WriteAccessLevel writeAccessLevel)
 
@@ -416,11 +402,6 @@ package "transaction" as transaction {
         }
         +interface "CardTransactionCryptoExtension" as CardTransactionCryptoExtension <<red>> {
         }
-        +interface "<color:blue>CardCertProviderSpi" as CardCertProviderSpi <<red>> {
-            +<color:blue>byte[] getIssuerKeyReference ()
-            +<color:blue>byte[] createCardCert (byte[] allData) ???
-            +<color:blue>byte[] createCardCert (byte[] data, byte[] recoverableData) ???
-        }
     }
 }
 
@@ -433,11 +414,6 @@ TransactionManager .up.> GetDataTag #C_USE : use >
 TransactionManager .left.> ChannelControl #C_USE : use >
 TransactionManager .right.> SearchCommandData #C_USE : use >
 
-PkiPersonalizationTransactionManager ..> CardCertParams #C_USE : use >
-
-CardCertParams ..> CardCertProviderSpi #C_USE : use >
-CardCertParams ..> CardCertificateFactory #C_USE : use >
-
 SecureTransactionManager .....> CardTransactionCryptoExtension #C_LINK : provide >
 
 SecureSymmetricCryptoTransactionManager .up.> WriteAccessLevel #C_USE : use >
@@ -473,12 +449,12 @@ FileHeader .up.> FileType #C_LINK : provide >
 ' == LAYOUT ==
 
 'SymmetricCryptoSecuritySetting -[hidden]- AsymmetricCryptoSecuritySetting
-AsymmetricCryptoSecuritySetting -[hidden]---- RuntimeException
+AsymmetricCryptoSecuritySetting -[hidden]left- RuntimeException
 
 AsymmetricCryptoCardTransactionManagerFactory -[hidden]- PcaCertificate
-PcaCertificate -[hidden]- CaCertificate
-CaCertificate -[hidden]- CaCertificateFactory
-CaCertificateFactory -[hidden]- CardCertificateFactory
+PcaCertificate -[hidden]right- CaCertificate
+CaCertificate -[hidden]right- CaCertificateFactory
+CaCertificateFactory -[hidden]right- CardCertificateFactory
 
 ' == STYLE ==
 

diff --git a/2.1.0-SNAPSHOT/api_class_diagram.svg b/2.1.0-SNAPSHOT/api_class_diagram.svg
diff --git a/2.1.0-SNAPSHOT/api_sequence_diagram_asymmetric_security_setting.puml b/2.1.0-SNAPSHOT/api_sequence_diagram_asymmetric_security_setting.puml
@@ -0,0 +1,59 @@
+@startuml
+title
+    <img:../assets/logo.svg{scale=0.2}>
+
+    AsymmetricSecuritySetting (2024-01-23)
+end title
+
+participant "App" as app
+participant "AsymmetricSecuritySetting" as setting
+participant "PcaCertificate" as pca
+participant "CaCertificate" as ca
+
+== addPcaCertificate ==
+
+activate app
+
+app -> setting : addPcaCertificate (pcaCertificate)
+activate setting
+
+setting -> pca : extractPublicKey ()
+activate pca
+setting <-- pca : publicKeySpi
+deactivate pca
+
+setting -> setting : savePublicKey (publicKeySpi)
+note right
+    map.put(publicKeySpi.getReference(), publicKeySpi.getValue())
+end note
+
+app <-- setting
+deactivate setting
+
+== addCaCertificate ==
+
+app -> setting : addCaCertificate (caCertificate)
+activate setting
+
+setting -> ca : getIssuerPublicKeyReference ()
+activate ca
+setting <-- ca : issuerPublicKeyReference
+deactivate ca
+
+setting -> setting : issuerPublicKey := findPublicKey (issuerPublicKeyReference)
+
+setting -> ca : extractPublicKey (issuerPublicKey.getPublicKey ())
+activate ca
+setting <-- ca : publicKeySpi
+deactivate ca
+
+setting -> setting : savePublicKey (publicKeySpi)
+note right
+    map.put(publicKeySpi.getReference(), publicKeySpi.getValue())
+end note
+
+app <-- setting
+deactivate setting
+
+
+@enduml