diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-01-20 17:40:59 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-01-20 17:40:59 -0500 |
| commit | 2125097d7c0452dce632a1b90348755ba5744f12 (patch) | |
| tree | f3d49fb0c29db977310de33aba4433126cb0c37f /usr/src/common | |
| parent | e6a9d81fcec6b169859244133a26be6cd74b9a03 (diff) | |
| parent | 1dc4a5921402bdb59d1de1e99e79a3f9d0dd51df (diff) | |
| download | illumos-joyent-2125097d7c0452dce632a1b90348755ba5744f12.tar.gz | |
[illumos-gate merge]
commit 1dc4a5921402bdb59d1de1e99e79a3f9d0dd51df
14329 sys/atomic.h: 5066 got the order of ifdef/endif wrong
commit 3e8b6b84e5ea96d276f9d6364e9f53b94d58ea00
14205 Want UDP src port hashing for VXLAN
commit 417127eb7a4962848176eeecdc1f2fb597c451f2
14384 libsocket: mismatched bound
commit 5aaf65b1581c191cf1ecb7151a3ad599f33f45f9
14352 sha1: mismatched bound
commit 56acfad3590872afa6b09b3aec90c03ebe17ef21
14404 Build fails if built in 'unused' dir
Conflicts:
usr/src/uts/common/netinet/udp.h
usr/src/uts/common/inet/udp_impl.h
usr/src/uts/common/inet/udp/udp_opt_data.c
usr/src/uts/common/inet/udp/udp.c
usr/src/cmd/truss/print.c
Diffstat (limited to 'usr/src/common')
| -rw-r--r-- | usr/src/common/crypto/sha1/sha1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/common/crypto/sha1/sha1.c b/usr/src/common/crypto/sha1/sha1.c index 3c7100a65e..08c7a2f52c 100644 --- a/usr/src/common/crypto/sha1/sha1.c +++ b/usr/src/common/crypto/sha1/sha1.c @@ -81,7 +81,7 @@ static void Encode(uint8_t *, const uint32_t *, size_t); (ctx)->state[3], (ctx)->state[4], (ctx), (in)) static void SHA1Transform(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, - SHA1_CTX *, const uint8_t *); + SHA1_CTX *, const uint8_t [64]); #elif defined(__amd64) @@ -95,7 +95,7 @@ void sha1_block_data_order(SHA1_CTX *ctx, const void *inpp, size_t num_blocks); #define SHA1_TRANSFORM(ctx, in) SHA1Transform((ctx), (in)) -static void SHA1Transform(SHA1_CTX *, const uint8_t *); +static void SHA1Transform(SHA1_CTX *, const uint8_t [64]); #endif |