deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for new API of PolarSSL

Browse Source
This commit is contained in:
NIIBE Yutaka
2013-03-19 14:22:43 +09:00
parent b9a4e8bcc0
commit bf727758df
3 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,3 +1,17 @@
2013-03-19 Niibe Yutaka <gniibe@fsij.org>
* src/call-rsa.c (rsa_sign): Follow change of API.
(modulus_calc, rsa_decrypt, rsa_verify): Likewise.
* src/openpgp-do.c (encrypt, decrypt): Likewise.
* polarssl/include/polarssl/aes.h: Updated from PolarSSL 1.2.6.
* polarssl/library/aes.c: Ditto.
* polarssl/include/polarssl/rsa.h: Ditto.
* polarssl/library/rsa.c: Ditto.
* polarssl/include/polarssl/bignum.h: Ditto.
* polarssl/library/bignum.c: Ditto.
* polarssl: Move from polarssl-0.14.0, and needed files only.
2013-03-15 Niibe Yutaka <gniibe@fsij.org> 2013-03-15 Niibe Yutaka <gniibe@fsij.org>
* regnual/regnual.ld (.bss): Put at RAM1. This makes reGNUal can * regnual/regnual.ld (.bss): Put at RAM1. This makes reGNUal can

31
src/call-rsa.c
View File

@@ -44,7 +44,10 @@ rsa_sign (const uint8_t *raw_message, uint8_t *output, int msg_len,
int r; int r;
unsigned char temp[RSA_SIGNATURE_LENGTH]; unsigned char temp[RSA_SIGNATURE_LENGTH];
mpi_init (&P1, &Q1, &H, NULL); mpi_init (&P1);
mpi_init (&Q1);
mpi_init (&H);
rsa_init (&rsa_ctx, RSA_PKCS_V15, 0); rsa_init (&rsa_ctx, RSA_PKCS_V15, 0);
rsa_ctx.len = KEY_CONTENT_LEN; rsa_ctx.len = KEY_CONTENT_LEN;
@@ -61,11 +64,13 @@ rsa_sign (const uint8_t *raw_message, uint8_t *output, int msg_len,
mpi_mod_mpi (&rsa_ctx.DP, &rsa_ctx.D, &P1); mpi_mod_mpi (&rsa_ctx.DP, &rsa_ctx.D, &P1);
mpi_mod_mpi (&rsa_ctx.DQ, &rsa_ctx.D, &Q1); mpi_mod_mpi (&rsa_ctx.DQ, &rsa_ctx.D, &Q1);
mpi_inv_mod (&rsa_ctx.QP, &rsa_ctx.Q, &rsa_ctx.P); mpi_inv_mod (&rsa_ctx.QP, &rsa_ctx.Q, &rsa_ctx.P);
mpi_free (&P1, &Q1, &H, NULL); mpi_free (&P1);
mpi_free (&Q1);
mpi_free (&H);
DEBUG_INFO ("RSA sign..."); DEBUG_INFO ("RSA sign...");
r = rsa_pkcs1_sign (&rsa_ctx, RSA_PRIVATE, SIG_RSA_RAW, r = rsa_rsassa_pkcs1_v15_sign (&rsa_ctx, RSA_PRIVATE, SIG_RSA_RAW,
msg_len, raw_message, temp); msg_len, raw_message, temp);
memcpy (output, temp, RSA_SIGNATURE_LENGTH); memcpy (output, temp, RSA_SIGNATURE_LENGTH);
rsa_free (&rsa_ctx); rsa_free (&rsa_ctx);
@@ -97,13 +102,17 @@ modulus_calc (const uint8_t *p, int len)
if (modulus == NULL) if (modulus == NULL)
return NULL; return NULL;
mpi_init (&P, &Q, &N, NULL); mpi_init (&P);
mpi_init (&Q);
mpi_init (&N);
mpi_read_binary (&P, p, len / 2); mpi_read_binary (&P, p, len / 2);
mpi_read_binary (&Q, p + len / 2, len / 2); mpi_read_binary (&Q, p + len / 2, len / 2);
mpi_mul_mpi (&N, &P, &Q); mpi_mul_mpi (&N, &P, &Q);
mpi_write_binary (&N, modulus, len); mpi_write_binary (&N, modulus, len);
mpi_free (&P, &Q, &N, NULL); mpi_free (&P);
mpi_free (&Q);
mpi_free (&N);
return modulus; return modulus;
} }
@@ -114,12 +123,14 @@ rsa_decrypt (const uint8_t *input, uint8_t *output, int msg_len,
{ {
mpi P1, Q1, H; mpi P1, Q1, H;
int r; int r;
int output_len; unsigned int output_len;
DEBUG_INFO ("RSA decrypt:"); DEBUG_INFO ("RSA decrypt:");
DEBUG_WORD ((uint32_t)&output_len); DEBUG_WORD ((uint32_t)&output_len);
mpi_init (&P1, &Q1, &H, NULL); mpi_init (&P1);
mpi_init (&Q1);
mpi_init (&H);
rsa_init (&rsa_ctx, RSA_PKCS_V15, 0); rsa_init (&rsa_ctx, RSA_PKCS_V15, 0);
rsa_ctx.len = msg_len; rsa_ctx.len = msg_len;
@@ -139,7 +150,9 @@ rsa_decrypt (const uint8_t *input, uint8_t *output, int msg_len,
mpi_mod_mpi (&rsa_ctx.DP, &rsa_ctx.D, &P1); mpi_mod_mpi (&rsa_ctx.DP, &rsa_ctx.D, &P1);
mpi_mod_mpi (&rsa_ctx.DQ, &rsa_ctx.D, &Q1); mpi_mod_mpi (&rsa_ctx.DQ, &rsa_ctx.D, &Q1);
mpi_inv_mod (&rsa_ctx.QP, &rsa_ctx.Q, &rsa_ctx.P); mpi_inv_mod (&rsa_ctx.QP, &rsa_ctx.Q, &rsa_ctx.P);
mpi_free (&P1, &Q1, &H, NULL); mpi_free (&P1);
mpi_free (&Q1);
mpi_free (&H);
DEBUG_INFO ("RSA decrypt ..."); DEBUG_INFO ("RSA decrypt ...");
@@ -173,7 +186,7 @@ rsa_verify (const uint8_t *pubkey, const uint8_t *hash, const uint8_t *sig)
DEBUG_INFO ("RSA verify..."); DEBUG_INFO ("RSA verify...");
r = rsa_pkcs1_verify (&rsa_ctx, RSA_PUBLIC, SIG_RSA_SHA256, 32, hash, sig); r = rsa_rsassa_pkcs1_v15_verify (&rsa_ctx, RSA_PUBLIC, SIG_RSA_SHA256, 32, hash, sig);
rsa_free (&rsa_ctx); rsa_free (&rsa_ctx);
if (r < 0) if (r < 0)

4
src/openpgp-do.c
View File

@@ -593,7 +593,7 @@ encrypt (const uint8_t *key, const uint8_t *iv, uint8_t *data, int len)
{ {
aes_context aes; aes_context aes;
uint8_t iv0[INITIAL_VECTOR_SIZE]; uint8_t iv0[INITIAL_VECTOR_SIZE];
int iv_offset; unsigned int iv_offset;
DEBUG_INFO ("ENC\r\n"); DEBUG_INFO ("ENC\r\n");
DEBUG_BINARY (data, len); DEBUG_BINARY (data, len);
@@ -612,7 +612,7 @@ decrypt (const uint8_t *key, const uint8_t *iv, uint8_t *data, int len)
{ {
aes_context aes; aes_context aes;
uint8_t iv0[INITIAL_VECTOR_SIZE]; uint8_t iv0[INITIAL_VECTOR_SIZE];
int iv_offset; unsigned int iv_offset;
aes_setkey_enc (&aes, key, 128); /* This is setkey_enc, because of CFB. */ aes_setkey_enc (&aes, key, 128); /* This is setkey_enc, because of CFB. */
memcpy (iv0, iv, INITIAL_VECTOR_SIZE); memcpy (iv0, iv, INITIAL_VECTOR_SIZE);