Changeset 5a6cc679 in mainline for uspace/lib/crypto


Ignore:
Timestamp:
2018-01-31T02:21:24Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a0a9cc2
Parents:
132ab5d1
Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works :)

Location:
uspace/lib/crypto
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/crypto/aes.c

    r132ab5d1 r5a6cc679  
    459459 *
    460460 */
    461 int aes_encrypt(uint8_t *key, uint8_t *input, uint8_t *output)
     461errno_t aes_encrypt(uint8_t *key, uint8_t *input, uint8_t *output)
    462462{
    463463        if ((!key) || (!input))
    … …  
    511511 *
    512512 */
    513 int aes_decrypt(uint8_t *key, uint8_t *input, uint8_t *output)
     513errno_t aes_decrypt(uint8_t *key, uint8_t *input, uint8_t *output)
    514514{
    515515        if ((!key) || (!input))

  • uspace/lib/crypto/crypto.c

    r132ab5d1 r5a6cc679  
    194194 *
    195195 */
    196 int create_hash(uint8_t *input, size_t input_size, uint8_t *output,
     196errno_t create_hash(uint8_t *input, size_t input_size, uint8_t *output,
    197197    hash_func_t hash_sel)
    198198{
    … …  
    266266 *
    267267 */
    268 int hmac(uint8_t *key, size_t key_size, uint8_t *msg, size_t msg_size,
     268errno_t hmac(uint8_t *key, size_t key_size, uint8_t *msg, size_t msg_size,
    269269    uint8_t *hash, hash_func_t hash_sel)
    270270{
    … …  
    322322 *
    323323 */
    324 int pbkdf2(uint8_t *pass, size_t pass_size, uint8_t *salt, size_t salt_size,
     324errno_t pbkdf2(uint8_t *pass, size_t pass_size, uint8_t *salt, size_t salt_size,
    325325    uint8_t *hash)
    326326{

  • uspace/lib/crypto/crypto.h

    r132ab5d1 r5a6cc679  
    3030#define LIBCRYPTO_H
    3131
     32#include <errno.h>
    3233#include <stddef.h>
    3334#include <stdint.h>
    … …  
    5051} hash_func_t;
    5152
    52 extern int rc4(uint8_t *, size_t, uint8_t *, size_t, size_t, uint8_t *);
    53 extern int aes_encrypt(uint8_t *, uint8_t *, uint8_t *);
    54 extern int aes_decrypt(uint8_t *, uint8_t *, uint8_t *);
    55 extern int create_hash(uint8_t *, size_t, uint8_t *, hash_func_t);
    56 extern int hmac(uint8_t *, size_t, uint8_t *, size_t, uint8_t *, hash_func_t);
    57 extern int pbkdf2(uint8_t *, size_t, uint8_t *, size_t, uint8_t *);
     53extern errno_t rc4(uint8_t *, size_t, uint8_t *, size_t, size_t, uint8_t *);
     54extern errno_t aes_encrypt(uint8_t *, uint8_t *, uint8_t *);
     55extern errno_t aes_decrypt(uint8_t *, uint8_t *, uint8_t *);
     56extern errno_t create_hash(uint8_t *, size_t, uint8_t *, hash_func_t);
     57extern errno_t hmac(uint8_t *, size_t, uint8_t *, size_t, uint8_t *, hash_func_t);
     58extern errno_t pbkdf2(uint8_t *, size_t, uint8_t *, size_t, uint8_t *);
    5859
    5960extern uint16_t crc16_ibm(uint16_t crc, uint8_t *buf, size_t len);

  • uspace/lib/crypto/rc4.c

    r132ab5d1 r5a6cc679  
    8888 *
    8989 */
    90 int rc4(uint8_t *key, size_t key_size, uint8_t *input, size_t input_size,
     90errno_t rc4(uint8_t *key, size_t key_size, uint8_t *input, size_t input_size,
    9191    size_t skip, uint8_t *output)
    9292{
Note: See TracChangeset for help on using the changeset viewer.