Changeset b7fd2a0 in mainline for uspace/lib/crypto

Timestamp:

2018-01-13T03:10:29Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:

uspace/lib/crypto

Files:

• aes.c (modified) (2 diffs)
• crypto.c (modified) (3 diffs)
• crypto.h (modified) (1 diff)
• rc4.c (modified) (1 diff)

uspace/lib/crypto/aes.c

@@ -459 +459 @@
  *
  */
-int aes_encrypt(uint8_t *key, uint8_t *input, uint8_t *output)
+errno_t aes_encrypt(uint8_t *key, uint8_t *input, uint8_t *output)
 {
         if ((!key) || (!input))
@@ -511 +511 @@
  *
  */
-int aes_decrypt(uint8_t *key, uint8_t *input, uint8_t *output)
+errno_t aes_decrypt(uint8_t *key, uint8_t *input, uint8_t *output)
 {
         if ((!key) || (!input))

uspace/lib/crypto/crypto.c

@@ -194 +194 @@
  *
  */
-int create_hash(uint8_t *input, size_t input_size, uint8_t *output,
+errno_t create_hash(uint8_t *input, size_t input_size, uint8_t *output,
     hash_func_t hash_sel)
 {
@@ -266 +266 @@
  *
  */
-int hmac(uint8_t *key, size_t key_size, uint8_t *msg, size_t msg_size, 
+errno_t hmac(uint8_t *key, size_t key_size, uint8_t *msg, size_t msg_size, 
     uint8_t *hash, hash_func_t hash_sel)
 {
@@ -322 +322 @@
  *
  */
-int pbkdf2(uint8_t *pass, size_t pass_size, uint8_t *salt, size_t salt_size,
+errno_t pbkdf2(uint8_t *pass, size_t pass_size, uint8_t *salt, size_t salt_size,
     uint8_t *hash)
 {

uspace/lib/crypto/crypto.h

@@ -51 +51 @@
 } hash_func_t;
 
-extern int rc4(uint8_t *, size_t, uint8_t *, size_t, size_t, uint8_t *);
-extern int aes_encrypt(uint8_t *, uint8_t *, uint8_t *);
-extern int aes_decrypt(uint8_t *, uint8_t *, uint8_t *);
-extern int create_hash(uint8_t *, size_t, uint8_t *, hash_func_t);
-extern int hmac(uint8_t *, size_t, uint8_t *, size_t, uint8_t *, hash_func_t);
-extern int pbkdf2(uint8_t *, size_t, uint8_t *, size_t, uint8_t *);
+extern errno_t rc4(uint8_t *, size_t, uint8_t *, size_t, size_t, uint8_t *);
+extern errno_t aes_encrypt(uint8_t *, uint8_t *, uint8_t *);
+extern errno_t aes_decrypt(uint8_t *, uint8_t *, uint8_t *);
+extern errno_t create_hash(uint8_t *, size_t, uint8_t *, hash_func_t);
+extern errno_t hmac(uint8_t *, size_t, uint8_t *, size_t, uint8_t *, hash_func_t);
+extern errno_t pbkdf2(uint8_t *, size_t, uint8_t *, size_t, uint8_t *);
 
 extern uint16_t crc16_ibm(uint16_t crc, uint8_t *buf, size_t len);

uspace/lib/crypto/rc4.c

@@ -88 +88 @@
  *
  */
-int rc4(uint8_t *key, size_t key_size, uint8_t *input, size_t input_size,
+errno_t rc4(uint8_t *key, size_t key_size, uint8_t *input, size_t input_size,
     size_t skip, uint8_t *output)
 {