Tue, 13 Oct 2015 12:55:37 +0200
changed name of a local variable to avoid a later name collision
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2015 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #ifndef DAV_CRYPTO_H #define DAV_CRYPTO_H #include "webdav.h" #include <openssl/evp.h> #include <ucx/string.h> #ifdef __sun #include <sha2.h> #else #include <openssl/sha.h> #endif #ifdef __cplusplus extern "C" { #endif typedef struct { EVP_CIPHER_CTX ctx; SHA256_CTX sha256; void *stream; dav_write_func write; DavKey *key; int init; unsigned char ivtmp[16]; size_t ivpos; } AESDecrypter; typedef struct { EVP_CIPHER_CTX ctx; SHA256_CTX sha256; void *iv; size_t ivlen; void *stream; dav_read_func read; char *tmp; size_t tmplen; size_t tmpoff; int end; } AESEncrypter; AESDecrypter* aes_decrypter_new(DavKey *key, void *stream, dav_write_func write_func); size_t aes_write(const void *buf, size_t s, size_t n, AESDecrypter *dec); void aes_decrypter_close(AESDecrypter *dec); void aes_decrypter_close2(EVP_CIPHER_CTX *ctx); AESEncrypter* aes_encrypter_new(DavKey *key, void *stream, dav_read_func read_func); size_t aes_read(void *buf, size_t s, size_t n, AESEncrypter *enc); void aes_encrypter_close(AESEncrypter *enc); char* aes_encrypt(char *in, size_t len, DavKey *key); char* aes_decrypt(char *in, size_t *len, DavKey *key); void dav_get_hash(SHA256_CTX *sha256, char *buf); #ifdef __cplusplus } #endif #endif /* DAV_CRYPTO_H */