tmp

Co-authored-by: julien.misiak

.gitea/PULL_REQUEST_TEMPLATE.yaml

@@ -1,4 +1,5 @@
 name: Demande de fusion (Pull Request)
+about: Créez une demande de fusion pour partager votre travail avec le reste de l'équipe
 body:
   - type: markdown
     attributes:

crates/sesam-vitale/src/main.rs

@@ -1,6 +1,8 @@
 mod ssvlib_demo;
 mod libssv;
+mod ssv_memory;
 
 fn main() {
     ssvlib_demo::demo();
+    // XXX
 }

crates/sesam-vitale/src/ssv_memory.rs

@@ -0,0 +1,325 @@
+/**
+ * Provide functions to manipulate raw memory from SSV library.
+ */
+
+// TODO : Est-ce qu'on pourrait/devrait définir un type custom pour représenter les tableaux de bytes ?
+
+use std::convert::TryFrom;
+
+#[derive(PartialEq, Debug)]
+struct ElementSize {
+    pub size: usize,
+    pub pad: usize,
+}
+
+impl TryFrom<&[u8]> for ElementSize {
+    type Error = &'static str;
+
+    fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
+            /* Longueur:
+        *   - si le bit de poids fort du premier octet est à 0, la longueur est codée sur un octet
+        *   - si le bit de poids fort du premier octet est à 1, les 7 bits de poids faible codent le nombre d'octets utilisés pour coder la longueur
+        */
+        if bytes.len() == 0 {
+            return Err("Empty bytes input");
+        }
+
+        let mut element_size = ElementSize { size: 0, pad: 1 };
+        if bytes[0] & 0b1000_0000 == 0 {
+            // Size coded on 1 byte
+            element_size.size = bytes[0] as usize;
+        } else {
+            // Size coded on N bytes
+            // N are the 7 lower bits of the first byte
+            let size_bytes_len = (bytes[0] & 0b0111_1111) as usize;
+            if size_bytes_len > bytes.len() - 1 {
+                return Err("Invalid memory: not enough bytes to read the size");
+            } else if size_bytes_len > 4 {
+                return Err("Invalid memory: size is too big");
+            }
+            let size_bytes = &bytes[1..1 + size_bytes_len];
+
+            // u32::from_be_bytes() requires a 4 bytes array
+            let mut padded_bytes = [0u8; 4];
+            padded_bytes[size_bytes_len..].copy_from_slice(&size_bytes);
+
+            element_size.size = u32::from_be_bytes(padded_bytes) as usize;
+            element_size.pad += size_bytes_len;
+        }
+        Ok(element_size)
+    }
+}
+
+#[derive(Debug)]
+pub struct Block<'a> {
+    pub id: u16,
+    pub size: usize,
+    pub content: Vec<Field<'a>>,
+}
+
+impl<'a> From<&'a [u8]> for Block<'a> {
+    fn from(bytes: &'a [u8]) -> Self {
+        let mut offset = 0;
+        let id = u16::from_be_bytes(bytes[..2].try_into().unwrap());
+        offset += 2;
+        let ElementSize { size: block_size, pad } = bytes[2..].try_into().unwrap();
+        offset += pad;
+        let raw_content = &bytes[offset..];
+        let mut field_offset = 0;
+        // While there is still content to read, parse Fields
+        let mut content = Vec::new();
+        while field_offset < block_size {
+            let field: Field<'a> = raw_content[field_offset..].into();
+            field_offset += field.size;
+            content.push(field);
+        }
+        Block {
+            id,
+            size: offset + block_size,
+            content,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Field<'a> {
+    pub size: usize,
+    pub content: &'a [u8],
+}
+
+impl<'a> From<&'a [u8]> for Field<'a> {
+    fn from(bytes: &'a [u8]) -> Self {
+        let ElementSize { size, pad } = bytes.try_into().unwrap();
+        let contenu = &bytes[pad..pad+size];
+        Field {
+            size: pad+size,
+            content: contenu,
+        }
+    }
+}
+
+pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Vec<Block> {
+    let mut blocks: Vec<Block> = Vec::new();
+    let mut offset = 0;
+    while offset < size {
+        let block: Block = bytes[offset..].into();
+        offset += block.size;
+        blocks.push(block);
+    }
+    blocks
+}
+
+#[cfg(test)]
+mod test_element_size {
+    use super::*;
+
+    #[test]
+    fn short_size() {
+        let bytes: &[u8] = &[0b_0000_0001_u8];
+        let element_size: ElementSize = bytes.try_into().unwrap();
+        assert_eq!(element_size.size, 1);
+        assert_eq!(element_size.pad, 1);
+
+        let bytes: &[u8] = &[0b_0100_0000_u8];
+        let element_size: ElementSize = bytes.try_into().unwrap();
+        assert_eq!(element_size.size, 64);
+        assert_eq!(element_size.pad, 1);
+    }
+
+    #[test]
+    fn long_size() {
+        let bytes: &[u8] = &[0b_1000_0010_u8, 0b_0000_0001_u8, 0b_0100_0000_u8];
+        let element_size: ElementSize = bytes.try_into().unwrap();
+        assert_eq!(element_size.size, 320);
+        assert_eq!(element_size.pad, 3);
+    }
+
+    #[test]
+    fn null_size() {
+        let bytes: &[u8] = &[];
+        let result: Result<ElementSize, &str> = bytes.try_into();
+        assert_eq!(
+            result,
+            Err("Empty bytes input"),
+        );
+    }
+
+    #[test]
+    fn invalid_memory() {
+        let bytes: &[u8] = &[0b_1000_0001_u8];
+        let result: Result<ElementSize, &str> = bytes.try_into();
+        assert_eq!(
+            result,
+            Err("Invalid memory: not enough bytes to read the size"),
+        );
+
+        let bytes: &[u8] = &[0b_1000_0010_u8, 1];
+        let result: Result<ElementSize, &str> = bytes.try_into();
+        assert_eq!(
+            result,
+            Err("Invalid memory: not enough bytes to read the size"),
+        );
+
+        let bytes: &[u8] = &[0b_1000_0101_u8, 1, 1, 1, 1, 1];
+        let result: Result<ElementSize, &str> = bytes.try_into();
+        assert_eq!(
+            result,
+            Err("Invalid memory: size is too big"),
+        );
+    }
+}
+
+#[cfg(test)]
+mod test_field {
+    use super::*;
+
+    #[test]
+    fn short_size() {
+        let bytes: &[u8] = &[51,
+            1, 48, 1, 56, 11, 57, 57, 55, 48, 48,
+            53, 50, 52, 49, 57, 52, 1, 52, 2, 50,
+            50, 17, 80, 72, 65, 82, 77, 65, 67, 73,
+            69, 78, 48, 48, 53, 50, 52, 49, 57, 9,
+            70, 82, 65, 78, 67, 79, 73, 83, 69, 1,
+            84,
+        ];
+        let element: Field = bytes.try_into().unwrap();
+        assert_eq!(element.size, 52);
+        assert_eq!(element.content[..5], [1, 48, 1, 56, 11]);
+    }
+
+    #[test]
+    fn long_size() {
+        let mut bytes_vec = vec![0b_1000_0010_u8,
+            0b_0000_0001_u8, 0b_0000_0000_u8, // size = 256
+        ];
+        // Add 256 bytes to the content
+        bytes_vec.append(&mut vec![1; 256]);
+        let bytes: &[u8] = &bytes_vec;
+        let element: Field = bytes.try_into().unwrap();
+        assert_eq!(element.size, 259);
+        assert_eq!(element.content.len(), 256);
+    }
+}
+
+#[cfg(test)]
+mod test_block {
+    use super::*;
+
+    #[test]
+    fn test_francoise_pharmacien0052419_partial_block_1() {
+        let bytes: &[u8] = &[
+            1, 48,
+            1, 56,
+            11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52,
+        ];
+        
+        let field1: Field = bytes.into();
+        assert_eq!(field1.size, 2);
+        assert_eq!(field1.content, &[48]);
+
+        let field2: Field = bytes[field1.size..].into();
+        assert_eq!(field2.size, 2);
+        assert_eq!(field2.content, &[56]);
+
+        let field3: Field = bytes[field1.size + field2.size..].into();
+        assert_eq!(field3.size, 12);
+        assert_eq!(field3.content, &[57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52]);
+    }
+
+    #[test]
+    fn test_francoise_pharmacien0052419() {
+        let bytes: &[u8] = &[
+        0, 1, 51, // 3
+            1, 48, // 2
+            1, 56, // 2
+            11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // 12
+            1, 52, // 2
+            2, 50, 50, // 3
+            17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, // 18
+            9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // 10
+            1, 84, // 2
+        // total: 54
+            
+        0, 2, 83,
+            1, 1,
+            1, 48,
+            1, 49,
+            2, 56, 54,
+            1, 49,
+            9, 48, 66, 48, 50, 50, 49, 57, 53, 56,
+            1, 56,
+            24, 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49, 57, 53,
+            8, 48, 48, 50, 48, 50, 52, 49, 57,
+            1, 56,
+            0,
+            1, 48,
+            1, 49,
+            2, 53, 48,
+            2, 49, 48,
+            2, 48, 48,
+            1, 48,
+            1, 48,
+            1, 48,
+            1, 49,
+            1, 49,
+        ];
+        
+        let first_block: Block = bytes.into();
+        assert_eq!(first_block.id, 1);
+        assert_eq!(first_block.size, 54);
+        assert_eq!(first_block.content.len(), 8);
+
+        let second_block: Block = bytes[first_block.size..].into();
+        assert_eq!(second_block.id, 2);
+        assert_eq!(second_block.size, 86);
+        assert_eq!(second_block.content.len(), 21);
+    }
+}
+
+#[cfg(test)]
+mod test_decode_ssv_memory {
+    use super::*;
+
+    #[test]
+    fn test_francoise_pharmacien0052419() {
+        let bytes: &[u8] = &[
+        0, 1, 51, // 3
+            1, 48, // 2
+            1, 56, // 2
+            11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // 12
+            1, 52, // 2
+            2, 50, 50, // 3
+            17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, // 18
+            9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // 10
+            1, 84, // 2
+        // total: 54
+            
+        0, 2, 83,
+            1, 1,
+            1, 48,
+            1, 49,
+            2, 56, 54,
+            1, 49,
+            9, 48, 66, 48, 50, 50, 49, 57, 53, 56,
+            1, 56,
+            24, 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49, 57, 53,
+            8, 48, 48, 50, 48, 50, 52, 49, 57,
+            1, 56,
+            0,
+            1, 48,
+            1, 49,
+            2, 53, 48,
+            2, 49, 48,
+            2, 48, 48,
+            1, 48,
+            1, 48,
+            1, 48,
+            1, 49,
+            1, 49,
+        ];
+        let blocks = decode_ssv_memory(&bytes, bytes.len());
+        println!("{:#?}", blocks);
+        assert_eq!(blocks.len(), 2);
+    }
+}

crates/sesam-vitale/src/ssvlib_demo.rs

@@ -1,24 +1,19 @@
+extern crate dotenv;
 /**
  * High level API for the SSV library,
  * based on the low level bindings in libssv.rs.
  *
  */
-
 extern crate libc;
-extern crate dotenv;
 
-use libc::{ c_void, size_t };
+use libc::{c_void, size_t};
 use std::ffi::CString;
 use std::path::PathBuf;
 use std::ptr;
 
 use std::env;
 
-use crate::libssv:: {
-    SSV_InitLIB2,
-    SSV_LireCartePS,
-    SSV_LireConfig
-};
+use crate::libssv::{SSV_InitLIB2, SSV_LireCartePS, SSV_LireConfig};
 
 fn ssv_init_lib_2() {
     let ini_str = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
@@ -29,33 +24,392 @@ fn ssv_init_lib_2() {
     }
 }
 
-fn ssv_lire_carte_ps() {
-    let resource_ps = CString::new("PS").expect("CString::new failed");
-    let resource_reader = CString::new("TRANSPA1").expect("CString::new failed");
-    let card_number = CString::new("1234567890").expect("CString::new failed");
+/*
+1. CB = Caractères Binaires »
+2. CE = Caractères « Etendus » (ISO 8859-1)
+3. CA = Caractères Alphanumériques (ASCII?)
+4. CN = Caractères Numériques
+*/
+
+#[derive(Debug)]
+struct CartePS {
+    titulaire: TitulairePS,
+    situations: Vec<SituationPS>,
+}
+#[derive(Debug)]
+struct TitulairePS {
+    type_de_carte_ps: String,                         // CN
+    type_d_identification_nationale: String,          // CN
+    numero_d_identification_nationale: String,        // CE - 8 -> 30
+    cle_du_numero_d_identification_nationale: String, // CN
+    code_civilite: String,                            // CN
+    nom_du_ps: String,                                // CE - 27
+    prenom_du_ps: String,                             // CE - 27
+    categorie_carte: char,                            // CA
+}
+
+#[derive(Debug)]
+struct SituationPS {
+    numero_logique_de_la_situation_de_facturation_du_ps: u8,
+    mode_d_exercice: String,
+    statut_d_exercice: String,
+    secteur_d_activite: String,
+    type_d_identification_structure: String,
+    numero_d_identification_structure: String,
+    cle_du_numero_d_identification_structure: String,
+    raison_sociale_structure: String,
+    numero_d_identification_de_facturation_du_ps: String,
+    cle_du_numero_d_identification_de_facturation_du_ps: String,
+    numero_d_identification_du_ps_remplaçant: String,
+    cle_du_numero_d_identification_du_ps_remplaçant: String,
+    code_conventionnel: String,
+    code_specialite: String,
+    code_zone_tarifaire: String,
+    code_zone_ik: String,
+    code_agrement_1: String,
+    code_agrement_2: String,
+    code_agrement_3: String,
+    habilitation_à_signer_une_facture: String,
+    habilitation_à_signer_un_lot: String,
+}
+
+impl Default for SituationPS {
+    fn default() -> Self {
+        Self {
+            numero_logique_de_la_situation_de_facturation_du_ps: 0,
+            mode_d_exercice: String::new(),
+            statut_d_exercice: String::new(),
+            secteur_d_activite: String::new(),
+            type_d_identification_structure: String::new(),
+            numero_d_identification_structure: String::new(),
+            cle_du_numero_d_identification_structure: String::new(),
+            raison_sociale_structure: String::new(),
+            numero_d_identification_de_facturation_du_ps: String::new(),
+            cle_du_numero_d_identification_de_facturation_du_ps: String::new(),
+            numero_d_identification_du_ps_remplaçant: String::new(),
+            cle_du_numero_d_identification_du_ps_remplaçant: String::new(),
+            code_conventionnel: String::new(),
+            code_specialite: String::new(),
+            code_zone_tarifaire: String::new(),
+            code_zone_ik: String::new(),
+            code_agrement_1: String::new(),
+            code_agrement_2: String::new(),
+            code_agrement_3: String::new(),
+            habilitation_à_signer_une_facture: String::new(),
+            habilitation_à_signer_un_lot: String::new(),
+        }
+    }
+}
+
+
+
+fn ssv_lire_carte_ps(code_pin :&str, lecteur :&str) {
+    let resource_ps =
+        CString::new(lecteur).expect("CString::new failed");
+    let resource_reader = CString::new("").expect("CString::new failed");
+    let card_number = CString::new(code_pin).expect("CString::new failed");
 
     let mut buffer: *mut c_void = ptr::null_mut();
     let mut size: size_t = 0;
+    let mut hex_values: &[u8] = &[];
     unsafe {
         let result = SSV_LireCartePS(
             resource_ps.as_ptr(),
             resource_reader.as_ptr(),
             card_number.as_ptr(),
             &mut buffer,
-            &mut size
+            &mut size,
         );
         println!("SSV_LireCartePS result: {}", result);
 
         if !buffer.is_null() {
-            let hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
-            for &byte in hex_values {
-                print!("{:02X} ", byte);
-            }
-            println!();
-
+            hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
             libc::free(buffer);
         }
     }
+    decode_zone_memoire(hex_values);
+
+    /* IDÉE : implémenter decode_zone_memoire sous forme d'itérateur
+    for (group, group_rank) in decode_zone_memoire(...) {
+        for (field, field_rank) in group {
+            match group_rank {
+                GROUP_1: {
+                    match field_rank {
+                        1 => carte_ps.titulaire.type_de_carte_ps = field.into(),
+                        2 => carte_ps.titulaire.type_d_identification_nationale = field.into(),
+                        3 => carte_ps.titulaire.numero_d_identification_nationale = field.into(),
+                        4 => carte_ps.titulaire.cle_du_numero_d_identification_nationale = field.into(),
+                        5 => carte_ps.titulaire.code_civilite = field.into(),
+                        6 => carte_ps.titulaire.nom_du_ps = field.into(),
+                        7 => carte_ps.titulaire.prenom_du_ps = field.into(),
+                        8 => carte_ps.titulaire.categorie_carte = field.into(),
+                        _ => (),
+                    }
+                }
+                GROUP_2: {
+                    match field_rank {
+                        ...
+                    }
+                }
+            }
+        }
+    }
+     */
+}
+
+/**
+ * Options possibles :
+ * - Passer un objet de type variable (CartePS, CarteVitale...) et le remplir intelligemment
+ * - Retourner un itérateur et faire le remplissage en dehors de decode_zone_memoire
+ */
+pub fn decode_zone_memoire(bytes: &[u8]) {
+    // Maintenant, vous pouvez accéder aux octets individuels dans `donnees`
+    let mut current_pos_general = 0;
+    let mut current_groupe = 0;
+    let mut num_champ = 0;
+
+    let mut carte_ps = CartePS {
+        titulaire: TitulairePS {
+            type_de_carte_ps: String::new(),
+            type_d_identification_nationale: String::new(),
+            numero_d_identification_nationale: String::new(),
+            cle_du_numero_d_identification_nationale: String::new(),
+            code_civilite: String::new(),
+            nom_du_ps: String::new(),
+            prenom_du_ps: String::new(),
+            categorie_carte: ' ',
+        },
+        situations: Vec::new(),
+    };
+
+    println!("--- Decoding Zone Memoire ---");
+    println!("Taille de la zone mémoire: {}", bytes.len());
+    while current_pos_general < bytes.len() - 1 {
+        num_champ = 0;
+        current_groupe =
+            256 * bytes[current_pos_general] as i32 + bytes[current_pos_general + 1] as i32;
+        println!("-- Nouveau groupe : {}", current_groupe);
+        current_pos_general += 2;
+
+        let longueur_groupe: usize;
+        if bytes[current_pos_general] < 128 {
+            longueur_groupe = bytes[current_pos_general] as usize;
+        } else {
+            let nbre_octets_longueur = bytes[current_pos_general] - 128;
+            longueur_groupe = (0..nbre_octets_longueur).fold(0, |acc, i| {
+                current_pos_general += 1;
+                acc + (256_i32.pow(i as u32) * bytes[current_pos_general] as i32) as usize
+            });
+        }
+        println!("--- Longueur groupe: {}", longueur_groupe);
+        current_pos_general += 1;
+
+        let mut current_pos_groupe = 0;
+        while current_pos_groupe < longueur_groupe {
+            num_champ += 1;
+            println!("---- Nouveau champ : {}", num_champ);
+            let longueur_champs: usize;
+            let nbre_octets_longueur: usize;
+            if bytes[current_pos_general] < 128 {
+                longueur_champs = bytes[current_pos_general] as usize;
+                nbre_octets_longueur = 1;
+            } else {
+                nbre_octets_longueur = bytes[current_pos_general] as usize - 128;
+                longueur_champs = (0..nbre_octets_longueur).fold(0, |acc, i| {
+                    current_pos_general += 1;
+                    current_pos_groupe += 1;
+                    acc + (256_i32.pow(i as u32) * bytes[current_pos_general] as i32) as usize
+                });
+            }
+            println!("----- Longueur champ: {}", longueur_champs);
+
+            let mut bytes_champ = vec![0; longueur_champs];
+            if longueur_champs > 0 {
+                bytes_champ.copy_from_slice(
+                    &bytes[current_pos_general + nbre_octets_longueur
+                        ..current_pos_general + nbre_octets_longueur + longueur_champs],
+                );
+                println!("----- Bytes du champ: {:?}", bytes_champ);
+
+                match current_groupe {
+                    1 => match num_champ {
+                        1 => {
+                            carte_ps.titulaire.type_de_carte_ps =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        2 => {
+                            carte_ps.titulaire.type_d_identification_nationale =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        3 => {
+                            carte_ps.titulaire.numero_d_identification_nationale =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        4 => {
+                            carte_ps.titulaire.cle_du_numero_d_identification_nationale =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        5 => {
+                            carte_ps.titulaire.code_civilite =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        6 => {
+                            carte_ps.titulaire.nom_du_ps =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        7 => {
+                            carte_ps.titulaire.prenom_du_ps =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        8 => {
+                            carte_ps.titulaire.categorie_carte = bytes_champ[0] as char;
+                        }
+                        _ => (),
+                    },
+                    2 => match num_champ {
+                        1 => {
+                            carte_ps.situations.push(SituationPS::default());
+                            carte_ps
+                                .situations
+                                .last_mut()
+                                .unwrap()
+                                .numero_logique_de_la_situation_de_facturation_du_ps =
+                                bytes_champ[0];
+                        }
+                        2 => {
+                            carte_ps.situations.last_mut().unwrap().mode_d_exercice =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        3 => {
+                            carte_ps.situations.last_mut().unwrap().statut_d_exercice =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        4 => {
+                            carte_ps.situations.last_mut().unwrap().secteur_d_activite =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        5 => {
+                            carte_ps
+                                .situations
+                                .last_mut()
+                                .unwrap()
+                                .type_d_identification_structure =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        6 => {
+                            carte_ps
+                                .situations
+                                .last_mut()
+                                .unwrap()
+                                .numero_d_identification_structure =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        7 => {
+                            carte_ps
+                                .situations
+                                .last_mut()
+                                .unwrap()
+                                .cle_du_numero_d_identification_structure =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        8 => {
+                            carte_ps
+                                .situations
+                                .last_mut()
+                                .unwrap()
+                                .raison_sociale_structure =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        9 => {
+                            carte_ps
+                                .situations
+                                .last_mut()
+                                .unwrap()
+                                .numero_d_identification_de_facturation_du_ps =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        10 => {
+                            carte_ps
+                                .situations
+                                .last_mut()
+                                .unwrap()
+                                .cle_du_numero_d_identification_de_facturation_du_ps =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        11 => {
+                            carte_ps
+                                .situations
+                                .last_mut()
+                                .unwrap()
+                                .numero_d_identification_du_ps_remplaçant =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        12 => {
+                            carte_ps
+                                .situations
+                                .last_mut()
+                                .unwrap()
+                                .cle_du_numero_d_identification_du_ps_remplaçant =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        13 => {
+                            carte_ps.situations.last_mut().unwrap().code_conventionnel =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        14 => {
+                            carte_ps.situations.last_mut().unwrap().code_specialite =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        15 => {
+                            carte_ps.situations.last_mut().unwrap().code_zone_tarifaire =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        16 => {
+                            carte_ps.situations.last_mut().unwrap().code_zone_ik =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        17 => {
+                            carte_ps.situations.last_mut().unwrap().code_agrement_1 =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        18 => {
+                            carte_ps.situations.last_mut().unwrap().code_agrement_2 =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        19 => {
+                            carte_ps.situations.last_mut().unwrap().code_agrement_3 =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        20 => {
+                            carte_ps
+                                .situations
+                                .last_mut()
+                                .unwrap()
+                                .habilitation_à_signer_une_facture =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        21 => {
+                            carte_ps
+                                .situations
+                                .last_mut()
+                                .unwrap()
+                                .habilitation_à_signer_un_lot =
+                                String::from_utf8_lossy(&bytes_champ).to_string();
+                        }
+                        _ => (),
+                    },
+                    _ => (),
+                }
+            } else {
+                println!("----- Pas de bytes pour ce champ");
+            }
+
+            current_pos_general += longueur_champs + nbre_octets_longueur;
+            current_pos_groupe += longueur_champs + nbre_octets_longueur;
+        }
+    }
+
+    println!("CartePS: {:#?}", carte_ps);
 }
 
 fn ssv_lire_config() {
@@ -86,11 +440,190 @@ pub fn demo() {
     let manifest_path = PathBuf::from(manifest_dir);
     dotenv::from_path(manifest_path.join(".env")).ok();
 
-    println!("------- Demo for the SSV library --------");
+    println!("------- Demo for the SSV library 2 --------");
 
     ssv_init_lib_2();
-    ssv_lire_carte_ps();
-    ssv_lire_config();
+    let code_pin = "1234";
+    let lecteur = "HID Global OMNIKEY 3x21 Smart Card Reader 0";
+    let carte_ps = ssv_lire_carte_ps2(code_pin, lecteur);
+    println!("CartePS: {:#?}", carte_ps);
+    // ssv_lire_config();
 
     println!("-----------------------------------------");
 }
+
+
+struct field{
+    rank : i32,
+    value :  Vec<u8>
+}
+impl Default for field {
+    fn default() -> Self {
+        Self {rank: 0,
+            value: Vec::new(),
+        }
+    }
+}
+pub struct group{
+    rank : i32,
+    fields :  Vec<field>
+}
+impl Default for group {
+    fn default() -> Self {
+        Self {rank: 0,
+              fields: Vec::new(),
+        }
+    }
+}
+
+ pub fn decode_zone_memoire2(bytes: &[u8]) -> Vec<group>{
+    
+    let mut current_pos_general = 0;
+    let mut current_groupe = 0;
+    let mut num_champ = 0;
+    let mut longueur_groupe: usize;
+    let mut current_pos_groupe = 0;
+      let mut groups : Vec<group> = Vec::new();
+
+    while current_pos_general < (bytes.len() - 1)  {
+        num_champ = 0;
+        current_groupe =
+            256 * bytes[current_pos_general] as i32 + bytes[current_pos_general + 1 ] as i32;
+        current_pos_general += 2;
+
+        groups.push(group::default());
+        groups.last_mut().unwrap().rank=current_groupe;
+
+        if bytes[current_pos_general] < 128 {
+            longueur_groupe = bytes[current_pos_general] as usize;
+        } else {
+            let nbre_octets_longueur = bytes[current_pos_general] - 128;
+            longueur_groupe = (0..nbre_octets_longueur).fold(0, |acc, i| {
+                current_pos_general += 1;
+                acc + (256_i32.pow(i as u32) * bytes[current_pos_general] as i32) as usize
+            });
+        }
+        current_pos_general += 1;
+        println!("------- 3--------");
+        current_pos_groupe = 0;
+        while current_pos_groupe < longueur_groupe {
+            num_champ += 1;
+            let longueur_champs: usize;
+            let nbre_octets_longueur: usize;
+            if bytes[current_pos_general] < 128 {
+                longueur_champs = bytes[current_pos_general] as usize;
+                nbre_octets_longueur = 1;
+            } else {
+                nbre_octets_longueur = bytes[current_pos_general] as usize - 128;
+                longueur_champs = (0..nbre_octets_longueur).fold(0, |acc, i| {
+                    current_pos_general += 1;
+                    current_pos_groupe += 1;
+                    acc + (256_i32.pow(i as u32) * bytes[current_pos_general] as i32) as usize
+                });
+            }
+
+            groups.last_mut().unwrap().fields.push(field::default());
+            groups.last_mut().unwrap().fields.last_mut().unwrap().rank=num_champ;
+                    
+            if longueur_champs > 0 {
+                let mut bytes_champ = vec![0; longueur_champs];
+                bytes_champ.copy_from_slice(
+                    &bytes[current_pos_general + nbre_octets_longueur
+                        ..current_pos_general + nbre_octets_longueur + longueur_champs],
+                );
+                
+                //groups.last_mut().unwrap().fields.last_mut().unwrap().value= String::from_utf8_lossy(&bytes_champ).to_string();
+                groups.last_mut().unwrap().fields.last_mut().unwrap().value= bytes_champ;
+
+
+            }
+            current_pos_general += longueur_champs + nbre_octets_longueur;
+            current_pos_groupe += longueur_champs + nbre_octets_longueur;
+        }
+    }
+    groups
+}
+
+fn ssv_lire_carte_ps2(code_pin :&str, lecteur :&str) -> CartePS{
+    let resource_ps = CString::new(lecteur).expect("CString::new failed");
+    let resource_reader = CString::new("").expect("CString::new failed");
+    let card_number = CString::new(code_pin).expect("CString::new failed");
+
+    let mut buffer: *mut c_void = ptr::null_mut();
+    let mut size: size_t = 0;
+    let mut hex_values: &[u8] = &[];
+    unsafe {
+        let result = SSV_LireCartePS(
+            resource_ps.as_ptr(),
+            resource_reader.as_ptr(),
+            card_number.as_ptr(),
+            &mut buffer,
+            &mut size,
+        );
+        println!("SSV_LireCartePS result: {}", result);
+
+        if !buffer.is_null() {
+            hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
+            libc::free(buffer);
+        }
+    }
+   let groups= decode_zone_memoire2(hex_values);
+   let mut carte_ps = CartePS {
+    titulaire: TitulairePS {
+        type_de_carte_ps: String::new(),
+        type_d_identification_nationale: String::new(),
+        numero_d_identification_nationale: String::new(),
+        cle_du_numero_d_identification_nationale: String::new(),
+        code_civilite: String::new(),
+        nom_du_ps: String::new(),
+        prenom_du_ps: String::new(),
+        categorie_carte: ' ',
+    },
+    situations: Vec::new(),
+};
+for item_group in groups.iter(){
+    for item_field in item_group.fields.iter(){
+        match (item_group.rank,item_field.rank) {
+            (1, 1) => {carte_ps.titulaire.type_de_carte_ps = String::from_utf8_lossy(&item_field.value).to_string();}
+            (1, 2) => {carte_ps.titulaire.type_d_identification_nationale = String::from_utf8_lossy(&item_field.value).to_string();}
+            (1, 3) => {carte_ps.titulaire.numero_d_identification_nationale = String::from_utf8_lossy(&item_field.value).to_string();}
+            (1, 4) => {carte_ps.titulaire.cle_du_numero_d_identification_nationale = String::from_utf8_lossy(&item_field.value).to_string();}
+            (1, 5) => {carte_ps.titulaire.code_civilite = String::from_utf8_lossy(&item_field.value).to_string();}
+            (1, 6) => {carte_ps.titulaire.nom_du_ps = String::from_utf8_lossy(&item_field.value).to_string();}
+            (1, 7) => {carte_ps.titulaire.prenom_du_ps = String::from_utf8_lossy(&item_field.value).to_string();}
+            (1, 8) => unsafe  {carte_ps.titulaire.categorie_carte = char::from_u32_unchecked(item_field.value[0] as u32)}
+            (2, 1) => {carte_ps.situations.push(SituationPS::default());
+                       carte_ps.situations.last_mut().unwrap().numero_logique_de_la_situation_de_facturation_du_ps = item_field.value[0];}
+            (2, 2) => {carte_ps.situations.last_mut().unwrap().mode_d_exercice = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 3) => {carte_ps.situations.last_mut().unwrap().statut_d_exercice = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 4) => {carte_ps.situations.last_mut().unwrap().secteur_d_activite = String::from_utf8_lossy(&item_field.value).to_string();}              
+            (2, 5) => {carte_ps.situations.last_mut().unwrap().type_d_identification_structure = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 6) => {carte_ps.situations.last_mut().unwrap().numero_d_identification_structure = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 7) => {carte_ps.situations.last_mut().unwrap().cle_du_numero_d_identification_structure = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 8) => {carte_ps.situations.last_mut().unwrap().raison_sociale_structure = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 9) => {carte_ps.situations.last_mut().unwrap().numero_d_identification_de_facturation_du_ps = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 10) => {carte_ps.situations.last_mut().unwrap().cle_du_numero_d_identification_de_facturation_du_ps = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 11) => {carte_ps.situations.last_mut().unwrap().numero_d_identification_du_ps_remplaçant = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 12) => {carte_ps.situations.last_mut().unwrap().cle_du_numero_d_identification_du_ps_remplaçant = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 13) => {carte_ps.situations.last_mut().unwrap().code_conventionnel = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 14) => {carte_ps.situations.last_mut().unwrap().code_specialite = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 15) => {carte_ps.situations.last_mut().unwrap().code_zone_tarifaire = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 16) => {carte_ps.situations.last_mut().unwrap().code_zone_ik = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 17) => {carte_ps.situations.last_mut().unwrap().code_agrement_1 = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 18) => {carte_ps.situations.last_mut().unwrap().code_agrement_2 = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 19) => {carte_ps.situations.last_mut().unwrap().code_agrement_3 = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 20) => {carte_ps.situations.last_mut().unwrap().habilitation_à_signer_une_facture = String::from_utf8_lossy(&item_field.value).to_string();}
+            (2, 21) => {carte_ps.situations.last_mut().unwrap().habilitation_à_signer_un_lot = String::from_utf8_lossy(&item_field.value).to_string();}
+            _ => (),
+        }
+    }
+}
+carte_ps
+
+}
+   
+
+
+
+
+