comparison: libidav/crypto.c
libidav/crypto.c
- branch
- dav-2
- changeset 891
- 4d58cbcc9efa
- parent 874
- 8f0add189b2f
equal
deleted
inserted
replaced
| 890:e77ccf1c4bb3 | 891:4d58cbcc9efa |
|---|---|
| 1520 dav_sha256_final(ctx, buf); | 1520 dav_sha256_final(ctx, buf); |
| 1521 free(ctx); | 1521 free(ctx); |
| 1522 } | 1522 } |
| 1523 | 1523 |
| 1524 CxBuffer* aes_encrypt_buffer(CxBuffer *in, DavKey *key) { | 1524 CxBuffer* aes_encrypt_buffer(CxBuffer *in, DavKey *key) { |
| 1525 CxBuffer *encbuf = cxBufferCreate(NULL, in->size, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); | 1525 CxBuffer *encbuf = cxBufferCreate(cxDefaultAllocator, NULL, in->size, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
| 1526 if(!encbuf) { | 1526 if(!encbuf) { |
| 1527 return NULL; | 1527 return NULL; |
| 1528 } | 1528 } |
| 1529 | 1529 |
| 1530 AESEncrypter *enc = aes_encrypter_new( | 1530 AESEncrypter *enc = aes_encrypter_new( |
| 1547 encbuf->pos = 0; | 1547 encbuf->pos = 0; |
| 1548 return encbuf; | 1548 return encbuf; |
| 1549 } | 1549 } |
| 1550 | 1550 |
| 1551 CxBuffer* aes_decrypt_buffer(CxBuffer *in, DavKey *key) { | 1551 CxBuffer* aes_decrypt_buffer(CxBuffer *in, DavKey *key) { |
| 1552 CxBuffer *decbuf = cxBufferCreate(NULL, in->size, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); | 1552 CxBuffer *decbuf = cxBufferCreate(cxDefaultAllocator, NULL, in->size, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
| 1553 if(!decbuf) { | 1553 if(!decbuf) { |
| 1554 return NULL; | 1554 return NULL; |
| 1555 } | 1555 } |
| 1556 AESDecrypter *dec = aes_decrypter_new( | 1556 AESDecrypter *dec = aes_decrypter_new( |
| 1557 key, | 1557 key, |
