projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PROV: Add a OP_keymgmt_match() function to our DH, DSA, RSA and EC_KEY impl
[oweals/openssl.git]
/
providers
/
implementations
/
ciphers
/
cipher_aes_xts.c
diff --git
a/providers/implementations/ciphers/cipher_aes_xts.c
b/providers/implementations/ciphers/cipher_aes_xts.c
index 1072418779cfaa7070b8eead173db993a82943ee..1da73c16e3e3ae976b6679a8978e38c84cd1476b 100644
(file)
--- a/
providers/implementations/ciphers/cipher_aes_xts.c
+++ b/
providers/implementations/ciphers/cipher_aes_xts.c
@@
-7,9
+7,16
@@
* https://www.openssl.org/source/license.html
*/
* https://www.openssl.org/source/license.html
*/
+/*
+ * AES low level APIs are deprecated for public use, but still ok for internal
+ * use where we're using them to implement the higher level EVP interface, as is
+ * the case here.
+ */
+#include "internal/deprecated.h"
+
#include "cipher_aes_xts.h"
#include "prov/implementations.h"
#include "cipher_aes_xts.h"
#include "prov/implementations.h"
-#include "
internal
/providercommonerr.h"
+#include "
prov
/providercommonerr.h"
/* TODO (3.0) Figure out what flags need to be set */
#define AES_XTS_FLAGS (EVP_CIPH_CUSTOM_IV \
/* TODO (3.0) Figure out what flags need to be set */
#define AES_XTS_FLAGS (EVP_CIPH_CUSTOM_IV \
@@
-134,7
+141,7
@@
static void *aes_xts_dupctx(void *vctx)
ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE);
return NULL;
}
ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE);
return NULL;
}
-
*ret = *in
;
+
in->base.hw->copyctx(&ret->base, &in->base)
;
return ret;
}
return ret;
}
@@
-152,7
+159,7
@@
static int aes_xts_cipher(void *vctx, unsigned char *out, size_t *outl,
return 0;
/*
return 0;
/*
- * Impose a limit of 2^20 blocks per data unit as specifed by
+ * Impose a limit of 2^20 blocks per data unit as specif
i
ed by
* IEEE Std 1619-2018. The earlier and obsolete IEEE Std 1619-2007
* indicated that this was a SHOULD NOT rather than a MUST NOT.
* NIST SP 800-38E mandates the same limit.
* IEEE Std 1619-2018. The earlier and obsolete IEEE Std 1619-2007
* indicated that this was a SHOULD NOT rather than a MUST NOT.
* NIST SP 800-38E mandates the same limit.