summaryrefslogtreecommitdiff
path: root/usr/src/common
diff options
context:
space:
mode:
authorDan McDonald <danmcd@joyent.com>2022-01-26 00:22:03 -0500
committerDan McDonald <danmcd@joyent.com>2022-01-26 00:22:03 -0500
commit8fc6db9038a26b94dd85991125777b95db7e1948 (patch)
tree3b96494c915dd31f9635347684b667cb57c9d5ac /usr/src/common
parente75aa64e237bd5789bba2f283da59dc9b1fb0fec (diff)
parent70ae9a334a768113a660b21305bf7d2cff941499 (diff)
downloadillumos-joyent-8fc6db9038a26b94dd85991125777b95db7e1948.tar.gz
[illumos-gate merge]
commit 70ae9a334a768113a660b21305bf7d2cff941499 14425 want probes for invvpid and invept 14426 expand seg_vmm tests commit 25cdfc4f8d373444e56178d1053ca53f1c3ea928 14428 formatting issues in memory(3c) man page commit ab3f6e90e6b1d8edee27c66beb8e53bc6033fb2a 14419 iprb transmit watchdog somewhat overzealous commit c9b01782224c4b5ea00e251ce64cfbd68ce276d6 14396 Makefile.master: gcc 11 support commit 5528cade4e43d027d848fdca33cccc9faa97823b 14388 des: with mismatched bound commit f4203ebbfd2dce9537b7614c6e37240f406907e8 14389 net80211: mismatched bound commit 2829495d7d810156bdfd454b8a1ef0f54eac9733 14386 libc: build errors with gcc 11 commit 1b863af9bc9a5c76ed773e129889fc19dbf9e41c 14393 stmf_sbd: build errors with gcc 11 commit 050c24f35c93857f1022f99834086ade54e70547 14326 dt_unring_buf: set dtbd_oldest to the start of the first record commit 817002c416c9301664eafbc288940123aa7d6fc9 14442 NVMe theory statement on spec version is confusing
Diffstat (limited to 'usr/src/common')
-rw-r--r--usr/src/common/crypto/des/des_impl.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/usr/src/common/crypto/des/des_impl.c b/usr/src/common/crypto/des/des_impl.c
index c88d558b6d..171d2365f4 100644
--- a/usr/src/common/crypto/des/des_impl.c
+++ b/usr/src/common/crypto/des/des_impl.c
@@ -499,9 +499,12 @@ des_crypt_impl(uint64_t *ks, uint64_t block, int one_or_three)
}
#endif /* !sun4u */
+/*
+ * block and out_block are assumed to be uint8_t [DES_BLOCK_LEN].
+ */
int
-des3_crunch_block(const void *cookie, const uint8_t block[DES_BLOCK_LEN],
- uint8_t out_block[DES_BLOCK_LEN], boolean_t decrypt)
+des3_crunch_block(const void *cookie, const uint8_t *block,
+ uint8_t *out_block, boolean_t decrypt)
{
keysched3_t *ksch = (keysched3_t *)cookie;
@@ -558,9 +561,12 @@ des3_crunch_block(const void *cookie, const uint8_t block[DES_BLOCK_LEN],
return (CRYPTO_SUCCESS);
}
+/*
+ * block and out_block are assumed to be uint8_t [DES_BLOCK_LEN].
+ */
int
-des_crunch_block(const void *cookie, const uint8_t block[DES_BLOCK_LEN],
- uint8_t out_block[DES_BLOCK_LEN], boolean_t decrypt)
+des_crunch_block(const void *cookie, const uint8_t *block,
+ uint8_t *out_block, boolean_t decrypt)
{
keysched_t *ksch = (keysched_t *)cookie;