diff --git a/sys/include/ape/libsec.h b/sys/include/ape/libsec.h index 09ae55c72..149eeed62 100644 --- a/sys/include/ape/libsec.h +++ b/sys/include/ape/libsec.h @@ -188,7 +188,7 @@ struct DESstate void setupDESstate(DESstate *s, uchar key[8], uchar *ivec); void des_key_setup(uchar[8], ulong[32]); -void block_cipher(ulong*, uchar*, int); +void block_cipher(ulong[32], uchar[8], int); void desCBCencrypt(uchar*, int, DESstate*); void desCBCdecrypt(uchar*, int, DESstate*); void desECBencrypt(uchar*, int, DESstate*); @@ -219,7 +219,7 @@ struct DES3state }; void setupDES3state(DES3state *s, uchar key[3][8], uchar *ivec); -void triple_block_cipher(ulong keys[3][32], uchar*, int); +void triple_block_cipher(ulong keys[3][32], uchar[8], int); void des3CBCencrypt(uchar*, int, DES3state*); void des3CBCdecrypt(uchar*, int, DES3state*); void des3ECBencrypt(uchar*, int, DES3state*); diff --git a/sys/include/libsec.h b/sys/include/libsec.h index 82d49d735..8f0094833 100644 --- a/sys/include/libsec.h +++ b/sys/include/libsec.h @@ -180,7 +180,7 @@ struct DESstate void setupDESstate(DESstate *s, uchar key[8], uchar *ivec); void des_key_setup(uchar[8], ulong[32]); -void block_cipher(ulong*, uchar*, int); +void block_cipher(ulong[32], uchar[8], int); void desCBCencrypt(uchar*, int, DESstate*); void desCBCdecrypt(uchar*, int, DESstate*); void desECBencrypt(uchar*, int, DESstate*); @@ -211,7 +211,7 @@ struct DES3state }; void setupDES3state(DES3state *s, uchar key[3][8], uchar *ivec); -void triple_block_cipher(ulong keys[3][32], uchar*, int); +void triple_block_cipher(ulong[3][32], uchar[8], int); void des3CBCencrypt(uchar*, int, DES3state*); void des3CBCdecrypt(uchar*, int, DES3state*); void des3ECBencrypt(uchar*, int, DES3state*); diff --git a/sys/src/libsec/port/des.c b/sys/src/libsec/port/des.c index c54541c58..090fd4b1f 100644 --- a/sys/src/libsec/port/des.c +++ b/sys/src/libsec/port/des.c @@ -369,7 +369,7 @@ keycompperm(u32int left, u32int right, ulong *ek) } void -des_key_setup(uchar key[8], ulong *ek) +des_key_setup(uchar key[8], ulong ek[32]) { u32int left, right, v0, v1; @@ -471,7 +471,7 @@ des64to56(uchar *k64, uchar *k56) } void -key_setup(uchar key[7], ulong *ek) +key_setup(uchar key[7], ulong ek[32]) { uchar k64[8];