Mercurial > dropbear
view libtomcrypt/src/encauth/ocb3/ocb3_add_aad.c @ 1499:2d450c1056e3
options: Complete the transition to numeric toggles (`#if')
For the sake of review, this commit alters only the code; the affiliated
comments within the source files also need to be updated, but doing so
now would obscure the operational changes that have been made here.
* All on/off options have been switched to the numeric `#if' variant;
that is the only way to make this `default_options.h.in' thing work
in a reasonable manner.
* There is now some very minor compile-time checking of the user's
choice of options.
* NO_FAST_EXPTMOD doesn't seem to be used, so it has been removed.
* ENABLE_USER_ALGO_LIST was supposed to be renamed DROPBEAR_USER_ALGO_LIST,
and this commit completes that work.
* DROPBEAR_FUZZ seems to be a relatively new, as-yet undocumented option,
which was added by the following commit:
commit 6e0b539e9ca0b5628c6c5a3d118ad6a2e79e8039
Author: Matt Johnston <[email protected]>
Date: Tue May 23 22:29:21 2017 +0800
split out checkpubkey_line() separately
It has now been added to `sysoptions.h' and defined as `0' by default.
* The configuration option `DROPBEAR_PASSWORD_ENV' is no longer listed in
`default_options.h.in'; it is no longer meant to be set by the user, and
is instead left to be defined in `sysoptions.h' (where it was already being
defined) as merely the name of the environment variable in question:
DROPBEAR_PASSWORD
To enable or disable use of that environment variable, the user must now
toggle `DROPBEAR_USE_DROPBEAR_PASSWORD'.
* The sFTP support is now toggled by setting `DROPBEAR_SFTPSERVER', and the
path of the sFTP server program is set independently through the usual
SFTPSERVER_PATH.
author | Michael Witten <mfwitten@gmail.com> |
---|---|
date | Thu, 20 Jul 2017 19:38:26 +0000 |
parents | 6dba84798cd5 |
children |
line wrap: on
line source
/* LibTomCrypt, modular cryptographic library -- Tom St Denis * * LibTomCrypt is a library that provides various cryptographic * algorithms in a highly modular and flexible manner. * * The library is free for all purposes without any express * guarantee it works. */ /** @file ocb3_add_aad.c OCB implementation, add AAD data, by Karel Miko */ #include "tomcrypt.h" #ifdef LTC_OCB3_MODE /** Add one block of AAD data (internal function) @param ocb The OCB state @param aad_block [in] AAD data (block_len size) @return CRYPT_OK if successful */ static int _ocb3_int_aad_add_block(ocb3_state *ocb, const unsigned char *aad_block) { unsigned char tmp[MAXBLOCKSIZE]; int err; /* Offset_i = Offset_{i-1} xor L_{ntz(i)} */ ocb3_int_xor_blocks(ocb->aOffset_current, ocb->aOffset_current, ocb->L_[ocb3_int_ntz(ocb->ablock_index)], ocb->block_len); /* Sum_i = Sum_{i-1} xor ENCIPHER(K, A_i xor Offset_i) */ ocb3_int_xor_blocks(tmp, aad_block, ocb->aOffset_current, ocb->block_len); if ((err = cipher_descriptor[ocb->cipher].ecb_encrypt(tmp, tmp, &ocb->key)) != CRYPT_OK) { return err; } ocb3_int_xor_blocks(ocb->aSum_current, ocb->aSum_current, tmp, ocb->block_len); ocb->ablock_index++; return CRYPT_OK; } /** Add AAD - additional associated data @param ocb The OCB state @param aad The AAD data @param aadlen The size of AAD data (octets) @return CRYPT_OK if successful */ int ocb3_add_aad(ocb3_state *ocb, const unsigned char *aad, unsigned long aadlen) { int err, x, full_blocks, full_blocks_len, last_block_len; unsigned char *data; unsigned long datalen, l; LTC_ARGCHK(ocb != NULL); if (aadlen == 0) return CRYPT_OK; LTC_ARGCHK(aad != NULL); if (ocb->adata_buffer_bytes > 0) { l = ocb->block_len - ocb->adata_buffer_bytes; if (l > aadlen) l = aadlen; XMEMCPY(ocb->adata_buffer+ocb->adata_buffer_bytes, aad, l); ocb->adata_buffer_bytes += l; if (ocb->adata_buffer_bytes == ocb->block_len) { if ((err = _ocb3_int_aad_add_block(ocb, ocb->adata_buffer)) != CRYPT_OK) { return err; } ocb->adata_buffer_bytes = 0; } data = (unsigned char *)aad + l; datalen = aadlen - l; } else { data = (unsigned char *)aad; datalen = aadlen; } if (datalen == 0) return CRYPT_OK; full_blocks = datalen/ocb->block_len; full_blocks_len = full_blocks * ocb->block_len; last_block_len = datalen - full_blocks_len; for (x=0; x<full_blocks; x++) { if ((err = _ocb3_int_aad_add_block(ocb, data+x*ocb->block_len)) != CRYPT_OK) { return err; } } if (last_block_len>0) { XMEMCPY(ocb->adata_buffer, data+full_blocks_len, last_block_len); ocb->adata_buffer_bytes = last_block_len; } return CRYPT_OK; } #endif /* ref: $Format:%D$ */ /* git commit: $Format:%H$ */ /* commit time: $Format:%ai$ */