Mercurial > dropbear
diff keyimport.c @ 1252:3f4af834314d
Merge branch 'fperrad-20151231_indent'
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 15 Mar 2016 21:41:22 +0800 |
| parents | 2bb4c662d1c2 |
| children | 56aba7dedbea 34e6127ef02e |
line wrap: on
line diff
--- a/keyimport.c Sat Mar 12 16:21:13 2016 +0800 +++ b/keyimport.c Tue Mar 15 21:41:22 2016 +0800 @@ -194,13 +194,13 @@ int datalen, int cpl) { unsigned char out[100]; - int n; + int n; unsigned long outlen; int rawcpl; rawcpl = cpl * 3 / 4; dropbear_assert((unsigned int)cpl < sizeof(out)); - while (datalen > 0) { + while (datalen > 0) { n = (datalen < rawcpl ? datalen : rawcpl); outlen = sizeof(out); base64_encode(data, n, out, &outlen); @@ -208,7 +208,7 @@ datalen -= n; fwrite(out, 1, outlen, fp); fputc('\n', fp); - } + } } /* * Read an ASN.1/BER identifier and length pair. @@ -1056,7 +1056,7 @@ dropbear_assert(k_size <= curve_size); buf_incrwritepos(seq_buf, ber_write_id_len(buf_getwriteptr(seq_buf, 10), 4, k_size, 0)); - mp_to_unsigned_bin((*eck)->k, buf_getwriteptr(seq_buf, k_size)); + mp_to_unsigned_bin((*eck)->k, buf_getwriteptr(seq_buf, k_size)); buf_incrwritepos(seq_buf, k_size); /* SECGCurveNames */