Loading crypto/modes/wrap128.c +20 −19 Original line number Diff line number Diff line Loading @@ -127,7 +127,7 @@ size_t CRYPTO_128_wrap(void *key, const unsigned char *iv, } /** Unwrapping according to RFC 3394 section 2.2.2 steps 1-2. * IV check (step 3) is responsibility of the caller. * The IV check (step 3) is responsibility of the caller. * * @param[in] key Key value. * @param[out] iv Unchecked IV value. Minimal buffer length = 8 bytes. Loading @@ -135,11 +135,11 @@ size_t CRYPTO_128_wrap(void *key, const unsigned char *iv, * Minimal buffer length = (inlen - 8) bytes. * Input and output buffers can overlap if block function * supports that. * @param[in] in Ciphertext text as n 64-bit blocks * @param[in] in Ciphertext as n 64-bit blocks. * @param[in] inlen Length of in. * @param[in] block Block processing function. * @return 0 if inlen is out of range [24, CRYPTO128_WRAP_MAX] * or if inlen is not multiply of 8. * or if inlen is not a multiple of 8. * Output length otherwise. */ static size_t crypto_128_unwrap_raw(void *key, unsigned char *iv, Loading Loading @@ -174,21 +174,22 @@ static size_t crypto_128_unwrap_raw(void *key, unsigned char *iv, return inlen; } /** Unwrapping according to RFC 3394 section 2.2.2 including IV check. * First block of plain text have to match supplied IV otherwise an error is * returned. /** Unwrapping according to RFC 3394 section 2.2.2, including the IV check. * The first block of plaintext has to match the supplied IV, otherwise an * error is returned. * * @param[in] key Key value. * @param[out] iv Unchecked IV value. Minimal buffer length = 8 bytes. * @param[out] iv IV value to match against. Length = 8 bytes. * NULL = use default_iv. * @param[out] out Plaintext without IV. * Minimal buffer length = (inlen - 8) bytes. * Input and output buffers can overlap if block function * supports that. * @param[in] in Ciphertext text as n 64-bit blocks * @param[in] in Ciphertext as n 64-bit blocks. * @param[in] inlen Length of in. * @param[in] block Block processing function. * @return 0 if inlen is out of range [24, CRYPTO128_WRAP_MAX] * or if inlen is not multiply of 8 * or if inlen is not a multiple of 8 * or if IV doesn't match expected value. * Output length otherwise. */ Loading Loading @@ -285,11 +286,11 @@ size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv, * @param[out] out Plaintext. Minimal buffer length = inlen bytes. * Input and output buffers can overlap if block function * supports that. * @param[in] in Ciphertext text as n 64-bit blocks * @param[in] in Ciphertext as n 64-bit blocks. * @param[in] inlen Length of in. * @param[in] block Block processing function. * @return 0 if inlen is out of range [16, CRYPTO128_WRAP_MAX], * or if inlen is not multiply of 8 * or if inlen is not a multiple of 8 * or if IV and message length indicator doesn't match. * Output length if unwrapping succeeded and IV matches. */ Loading Loading
crypto/modes/wrap128.c +20 −19 Original line number Diff line number Diff line Loading @@ -127,7 +127,7 @@ size_t CRYPTO_128_wrap(void *key, const unsigned char *iv, } /** Unwrapping according to RFC 3394 section 2.2.2 steps 1-2. * IV check (step 3) is responsibility of the caller. * The IV check (step 3) is responsibility of the caller. * * @param[in] key Key value. * @param[out] iv Unchecked IV value. Minimal buffer length = 8 bytes. Loading @@ -135,11 +135,11 @@ size_t CRYPTO_128_wrap(void *key, const unsigned char *iv, * Minimal buffer length = (inlen - 8) bytes. * Input and output buffers can overlap if block function * supports that. * @param[in] in Ciphertext text as n 64-bit blocks * @param[in] in Ciphertext as n 64-bit blocks. * @param[in] inlen Length of in. * @param[in] block Block processing function. * @return 0 if inlen is out of range [24, CRYPTO128_WRAP_MAX] * or if inlen is not multiply of 8. * or if inlen is not a multiple of 8. * Output length otherwise. */ static size_t crypto_128_unwrap_raw(void *key, unsigned char *iv, Loading Loading @@ -174,21 +174,22 @@ static size_t crypto_128_unwrap_raw(void *key, unsigned char *iv, return inlen; } /** Unwrapping according to RFC 3394 section 2.2.2 including IV check. * First block of plain text have to match supplied IV otherwise an error is * returned. /** Unwrapping according to RFC 3394 section 2.2.2, including the IV check. * The first block of plaintext has to match the supplied IV, otherwise an * error is returned. * * @param[in] key Key value. * @param[out] iv Unchecked IV value. Minimal buffer length = 8 bytes. * @param[out] iv IV value to match against. Length = 8 bytes. * NULL = use default_iv. * @param[out] out Plaintext without IV. * Minimal buffer length = (inlen - 8) bytes. * Input and output buffers can overlap if block function * supports that. * @param[in] in Ciphertext text as n 64-bit blocks * @param[in] in Ciphertext as n 64-bit blocks. * @param[in] inlen Length of in. * @param[in] block Block processing function. * @return 0 if inlen is out of range [24, CRYPTO128_WRAP_MAX] * or if inlen is not multiply of 8 * or if inlen is not a multiple of 8 * or if IV doesn't match expected value. * Output length otherwise. */ Loading Loading @@ -285,11 +286,11 @@ size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv, * @param[out] out Plaintext. Minimal buffer length = inlen bytes. * Input and output buffers can overlap if block function * supports that. * @param[in] in Ciphertext text as n 64-bit blocks * @param[in] in Ciphertext as n 64-bit blocks. * @param[in] inlen Length of in. * @param[in] block Block processing function. * @return 0 if inlen is out of range [16, CRYPTO128_WRAP_MAX], * or if inlen is not multiply of 8 * or if inlen is not a multiple of 8 * or if IV and message length indicator doesn't match. * Output length if unwrapping succeeded and IV matches. */ Loading
Stephen Henson <steve@openssl.org> Reviewed-by:
Emilia Käsper <emilia@openssl.org>