a lot of fixing ...

[arm-crypto-lib.git] / rsa / rsa_oaep.c

diff --git a/rsa/rsa_oaep.c b/rsa/rsa_oaep.c
index 5e32546de9d159dd7c4ac9764cb523caff4f6e49..4fa488bcc601b6812477531e0ea28764e8beaa5d 100644 (file)
--- a/rsa/rsa_oaep.c
+++ b/rsa/rsa_oaep.c
@@ -65,10 +65,12 @@ uint8_t rsa_encrypt_oaep(void* dest, uint16_t* out_length,
                return 1;
        }
        uint16_t buffer_len = bigint_length_B(key->modulus);
+/*
        cli_putstr("\r\n buffer_len = ");
        cli_hexdump_rev(&buffer_len, 2);
        cli_putstr("\r\n modulus_len = ");
        cli_hexdump_rev(&key->modulus->length_B, 2);
+*/
        uint8_t* buffer = (uint8_t*)dest;
        uint8_t off;
        /* the following needs some explanation:
@@ -79,8 +81,8 @@ uint8_t rsa_encrypt_oaep(void* dest, uint16_t* out_length,
                        % (sizeof(bigint_word_t));
        buffer += off;
     buffer_len -= off;
-    cli_putstr("\r\n  off = ");
-    cli_hexdump_byte(off);
+//    cli_putstr("\r\n  off = ");
+//    cli_hexdump_byte(off);
        uint8_t* seed_buffer = buffer + 1;
        uint16_t db_len = buffer_len - hv_len - 1;
        uint8_t* db = seed_buffer + hv_len;
@@ -105,14 +107,14 @@ uint8_t rsa_encrypt_oaep(void* dest, uint16_t* out_length,
                        seed_buffer[i] = prng_get_byte();
                }
        }
-       cli_putstr("\r\n  msg (raw, pre-feistel):\r\n");
-       cli_hexdump_block(dest, bigint_length_B(key->modulus), 4, 16);
+//     cli_putstr("\r\n  msg (raw, pre-feistel):\r\n");
+//     cli_hexdump_block(dest, bigint_length_B(key->modulus), 4, 16);
        p->mgf(maskbuffer, seed_buffer, hv_len, db_len, p->mgf_parameter);
        memxor(db, maskbuffer, db_len);
        p->mgf(maskbuffer, db, db_len, hv_len, p->mgf_parameter);
        memxor(seed_buffer, maskbuffer, hv_len);
-       cli_putstr("\r\n  msg (raw, post-feistel):\r\n");
-       cli_hexdump_block(dest, bigint_length_B(key->modulus), 4, 16);
+//     cli_putstr("\r\n  msg (raw, post-feistel):\r\n");
+//     cli_hexdump_block(dest, bigint_length_B(key->modulus), 4, 16);
 
        x.wordv = dest;
        x.length_B = key->modulus->length_B;
@@ -129,7 +131,7 @@ uint8_t rsa_decrypt_oaep(void* dest, uint16_t* out_length,
                              rsa_privatekey_t* key, const rsa_oaep_parameter_t *p,
                              const rsa_label_t* label, void* seed){
 
-       cli_putstr("\r\n -->rsa_decrypt_oaep()"); uart_flush(0);
+//     cli_putstr("\r\n -->rsa_decrypt_oaep()"); uart_flush(0);
        if(!label){
                label = &rsa_oaep_default_label;
        }
@@ -151,7 +153,7 @@ uint8_t rsa_decrypt_oaep(void* dest, uint16_t* out_length,
        memset(dest, 0, bigint_length_B(key->modulus) - length_B);
        memcpy((uint8_t*)dest + bigint_length_B(key->modulus) - length_B, src, length_B);
 
-       cli_putc('a'); uart_flush(0);
+//     cli_putc('a'); uart_flush(0);
 
        x.wordv = dest;
        x.length_B = key->modulus->length_B;
@@ -159,52 +161,47 @@ uint8_t rsa_decrypt_oaep(void* dest, uint16_t* out_length,
        bigint_adjust(&x);
 
 
-       cli_putc('b'); uart_flush(0);
+//     cli_putc('b'); uart_flush(0);
        rsa_os2ip(&x, NULL, bigint_length_B(key->modulus));
-       cli_putc('c'); uart_flush(0);
+//     cli_putc('c'); uart_flush(0);
        rsa_dec(&x, key);
-       cli_putc('d'); uart_flush(0);
+//     cli_putc('d'); uart_flush(0);
        rsa_i2osp(NULL, &x, &data_len);
 
-       cli_putstr("\r\n  msg (raw, pre-move):\r\n");
-       cli_hexdump_block(dest, bigint_length_B(key->modulus), 4, 16);
+//     cli_putstr("\r\n  msg (raw, pre-move):\r\n");
+//     cli_hexdump_block(dest, bigint_length_B(key->modulus), 4, 16);
 
        if(data_len > x_len){
                return 7;
        }
-
+/*
        cli_putstr("\r\n moving some bytes; x_len = ");
        cli_hexdump_rev(&x_len, 2);
        cli_putstr("  data_len = ");
        cli_hexdump_rev(&data_len, 2);
        uart_flush(0);
-
+*/
        if(x_len != data_len){
                memmove((uint8_t*)dest + x_len - data_len, dest, data_len);
-               cli_putstr("  (oh, not dead yet?!)");
-               uart_flush(0);
+//             cli_putstr("  (oh, not dead yet?!)");
+//             uart_flush(0);
                memset(dest, 0, x_len - data_len);
        }
 
        hfal_hash_mem(p->hf, label_hv, label->label, label->length_b);
 /*
-       if(buffer[0] != 0){
-               return 1;
-       }
-*/
        cli_putstr("\r\n  msg (raw, pre-feistel):\r\n");
        cli_hexdump_block(seed_buffer, bigint_length_B(key->modulus), 4, 16);
-
        uart_flush(0);
-
+*/
        p->mgf(maskbuffer, db_buffer, db_len, hv_len, p->mgf_parameter);
        memxor(seed_buffer, maskbuffer, hv_len);
        p->mgf(maskbuffer, seed_buffer, hv_len, db_len, p->mgf_parameter);
        memxor(db_buffer, maskbuffer, db_len);
 
        if(memcmp(label_hv, db_buffer, hv_len)){
-               cli_putstr("\r\nDBG: DB:\r\n");
-               cli_hexdump_block(db_buffer, db_len, 4, 16);
+//             cli_putstr("\r\nDBG: DB:\r\n");
+//             cli_hexdump_block(db_buffer, db_len, 4, 16);
                return 2;
        }