[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue May 11 10:12:36 MDT 2010
The branch, master has been updated
via b81887f... tdb: commit ABI/tdb-1.2.2.sigs
via 5797b9a... s4:heimdal: remove unused heimdal/lib/hcrypto/evp-cc.c
via 3349407... s4:heimdal_build: remove heimdal/lib/hcrypto/evp-cc.c from the build
from 04e1954... s3:configure: fix a message
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b81887f2d97969d98023896c90ec8aa98f30242c
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue May 11 16:42:14 2010 +0200
tdb: commit ABI/tdb-1.2.2.sigs
metze
commit 5797b9a913f6a7f751485b42ecb4206fb589137a
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue May 11 18:10:32 2010 +0200
s4:heimdal: remove unused heimdal/lib/hcrypto/evp-cc.c
metze
commit 33494074582b70a96e7762c4854003f65790aef0
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue May 11 16:21:45 2010 +0200
s4:heimdal_build: remove heimdal/lib/hcrypto/evp-cc.c from the build
This is not needed and contains one big #ifdef __APPLE__
and breaks the build on Mac OS 10.
metze
-----------------------------------------------------------------------
Summary of changes:
lib/tdb/ABI/tdb-1.2.2.sigs | 60 +++
source4/heimdal/lib/hcrypto/evp-cc.c | 659 ----------------------------------
source4/heimdal_build/wscript_build | 2 +-
3 files changed, 61 insertions(+), 660 deletions(-)
create mode 100644 lib/tdb/ABI/tdb-1.2.2.sigs
delete mode 100644 source4/heimdal/lib/hcrypto/evp-cc.c
Changeset truncated at 500 lines:
diff --git a/lib/tdb/ABI/tdb-1.2.2.sigs b/lib/tdb/ABI/tdb-1.2.2.sigs
new file mode 100644
index 0000000..043790d
--- /dev/null
+++ b/lib/tdb/ABI/tdb-1.2.2.sigs
@@ -0,0 +1,60 @@
+tdb_add_flags: void (struct tdb_context *, unsigned int)
+tdb_append: int (struct tdb_context *, TDB_DATA, TDB_DATA)
+tdb_chainlock: int (struct tdb_context *, TDB_DATA)
+tdb_chainlock_mark: int (struct tdb_context *, TDB_DATA)
+tdb_chainlock_nonblock: int (struct tdb_context *, TDB_DATA)
+tdb_chainlock_read: int (struct tdb_context *, TDB_DATA)
+tdb_chainlock_unmark: int (struct tdb_context *, TDB_DATA)
+tdb_chainunlock: int (struct tdb_context *, TDB_DATA)
+tdb_chainunlock_read: int (struct tdb_context *, TDB_DATA)
+tdb_check: int (struct tdb_context *, int (*)(TDB_DATA, TDB_DATA, void *), void *)
+tdb_close: int (struct tdb_context *)
+tdb_delete: int (struct tdb_context *, TDB_DATA)
+tdb_dump_all: void (struct tdb_context *)
+tdb_enable_seqnum: void (struct tdb_context *)
+tdb_error: enum TDB_ERROR (struct tdb_context *)
+tdb_errorstr: const char *(struct tdb_context *)
+tdb_exists: int (struct tdb_context *, TDB_DATA)
+tdb_fd: int (struct tdb_context *)
+tdb_fetch: TDB_DATA (struct tdb_context *, TDB_DATA)
+tdb_firstkey: TDB_DATA (struct tdb_context *)
+tdb_freelist_size: int (struct tdb_context *)
+tdb_get_flags: int (struct tdb_context *)
+tdb_get_logging_private: void *(struct tdb_context *)
+tdb_get_seqnum: int (struct tdb_context *)
+tdb_hash_size: int (struct tdb_context *)
+tdb_increment_seqnum_nonblock: void (struct tdb_context *)
+tdb_lockall: int (struct tdb_context *)
+tdb_lockall_mark: int (struct tdb_context *)
+tdb_lockall_nonblock: int (struct tdb_context *)
+tdb_lockall_read: int (struct tdb_context *)
+tdb_lockall_read_nonblock: int (struct tdb_context *)
+tdb_lockall_unmark: int (struct tdb_context *)
+tdb_log_fn: tdb_log_func (struct tdb_context *)
+tdb_map_size: size_t (struct tdb_context *)
+tdb_name: const char *(struct tdb_context *)
+tdb_nextkey: TDB_DATA (struct tdb_context *, TDB_DATA)
+tdb_null: dptr = 0xXXXX, dsize = 0
+tdb_open: struct tdb_context *(const char *, int, int, int, mode_t)
+tdb_open_ex: struct tdb_context *(const char *, int, int, int, mode_t, const struct tdb_logging_context *, tdb_hash_func)
+tdb_parse_record: int (struct tdb_context *, TDB_DATA, int (*)(TDB_DATA, TDB_DATA, void *), void *)
+tdb_printfreelist: int (struct tdb_context *)
+tdb_remove_flags: void (struct tdb_context *, unsigned int)
+tdb_reopen: int (struct tdb_context *)
+tdb_reopen_all: int (int)
+tdb_repack: int (struct tdb_context *)
+tdb_set_logging_function: void (struct tdb_context *, const struct tdb_logging_context *)
+tdb_set_max_dead: void (struct tdb_context *, int)
+tdb_setalarm_sigptr: void (struct tdb_context *, volatile sig_atomic_t *)
+tdb_store: int (struct tdb_context *, TDB_DATA, TDB_DATA, int)
+tdb_transaction_cancel: int (struct tdb_context *)
+tdb_transaction_commit: int (struct tdb_context *)
+tdb_transaction_prepare_commit: int (struct tdb_context *)
+tdb_transaction_start: int (struct tdb_context *)
+tdb_transaction_start_nonblock: int (struct tdb_context *)
+tdb_traverse: int (struct tdb_context *, tdb_traverse_func, void *)
+tdb_traverse_read: int (struct tdb_context *, tdb_traverse_func, void *)
+tdb_unlockall: int (struct tdb_context *)
+tdb_unlockall_read: int (struct tdb_context *)
+tdb_validate_freelist: int (struct tdb_context *, int *)
+tdb_wipe_all: int (struct tdb_context *)
diff --git a/source4/heimdal/lib/hcrypto/evp-cc.c b/source4/heimdal/lib/hcrypto/evp-cc.c
deleted file mode 100644
index f1da225..0000000
--- a/source4/heimdal/lib/hcrypto/evp-cc.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/*
- * Copyright (c) 2008 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- *
- * Portions Copyright (c) 2009 Apple Inc. 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.
- *
- * 3. Neither the name of the Institute nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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 INSTITUTE 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.
- */
-
-/* CommonCrypto provider */
-
-#ifdef __APPLE__
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H
-#include <CommonCrypto/CommonDigest.h>
-#endif
-#include <CommonCrypto/CommonCryptor.h>
-
-#include <evp.h>
-#include <evp-cc.h>
-
-/*
- *
- */
-
-struct cc_key {
- CCCryptorRef href;
-};
-
-static int
-cc_do_cipher(EVP_CIPHER_CTX *ctx,
- unsigned char *out,
- const unsigned char *in,
- unsigned int size)
-{
- struct cc_key *cc = ctx->cipher_data;
- CCCryptorStatus ret;
- size_t moved;
-
- memcpy(out, in, size);
-
- ret = CCCryptorUpdate(cc->href, in, size, out, size, &moved);
- if (ret)
- return 0;
-
- if (moved != size)
- return 0;
-
- return 1;
-}
-
-static int
-cc_cleanup(EVP_CIPHER_CTX *ctx)
-{
- struct cc_key *cc = ctx->cipher_data;
- if (cc->href)
- CCCryptorRelease(cc->href);
- return 1;
-}
-
-static int
-init_cc_key(int encp, CCAlgorithm alg, const void *key,
- size_t keylen, const void *iv, CCCryptorRef *ref)
-{
- CCOperation op = encp ? kCCEncrypt : kCCDecrypt;
- CCCryptorStatus ret;
-
- if (*ref) {
- if (key == NULL && iv) {
- CCCryptorReset(*ref, iv);
- return 1;
- }
- CCCryptorRelease(*ref);
- }
-
- ret = CCCryptorCreate(op, alg, 0, key, keylen, iv, ref);
- if (ret)
- return 0;
- return 1;
-}
-
-static int
-cc_des_ede3_cbc_init(EVP_CIPHER_CTX *ctx,
- const unsigned char * key,
- const unsigned char * iv,
- int encp)
-{
- struct cc_key *cc = ctx->cipher_data;
- return init_cc_key(encp, kCCAlgorithm3DES, key, kCCKeySize3DES, iv, &cc->href);
-}
-
-/**
- * The tripple DES cipher type (Apple CommonCrypto provider)
- *
- * @return the DES-EDE3-CBC EVP_CIPHER pointer.
- *
- * @ingroup hcrypto_evp
- */
-
-const EVP_CIPHER *
-EVP_cc_des_ede3_cbc(void)
-{
- static const EVP_CIPHER des_ede3_cbc = {
- 0,
- 8,
- 24,
- 8,
- EVP_CIPH_CBC_MODE|EVP_CIPH_ALWAYS_CALL_INIT,
- cc_des_ede3_cbc_init,
- cc_do_cipher,
- cc_cleanup,
- sizeof(struct cc_key),
- NULL,
- NULL,
- NULL,
- NULL
- };
- return &des_ede3_cbc;
-}
-
-/*
- *
- */
-
-static int
-cc_des_cbc_init(EVP_CIPHER_CTX *ctx,
- const unsigned char * key,
- const unsigned char * iv,
- int encp)
-{
- struct cc_key *cc = ctx->cipher_data;
- return init_cc_key(encp, kCCAlgorithmDES, key, kCCBlockSizeDES, iv, &cc->href);
-}
-
-/**
- * The DES cipher type (Apple CommonCrypto provider)
- *
- * @return the DES-CBC EVP_CIPHER pointer.
- *
- * @ingroup hcrypto_evp
- */
-
-const EVP_CIPHER *
-EVP_cc_des_cbc(void)
-{
- static const EVP_CIPHER des_ede3_cbc = {
- 0,
- kCCBlockSizeDES,
- kCCBlockSizeDES,
- kCCBlockSizeDES,
- EVP_CIPH_CBC_MODE|EVP_CIPH_ALWAYS_CALL_INIT,
- cc_des_cbc_init,
- cc_do_cipher,
- cc_cleanup,
- sizeof(struct cc_key),
- NULL,
- NULL,
- NULL,
- NULL
- };
- return &des_ede3_cbc;
-}
-
-/*
- *
- */
-
-static int
-cc_aes_cbc_init(EVP_CIPHER_CTX *ctx,
- const unsigned char * key,
- const unsigned char * iv,
- int encp)
-{
- struct cc_key *cc = ctx->cipher_data;
- return init_cc_key(encp, kCCAlgorithmAES128, key, ctx->cipher->key_len, iv, &cc->href);
-}
-
-/**
- * The AES-128 cipher type (Apple CommonCrypto provider)
- *
- * @return the AES-128-CBC EVP_CIPHER pointer.
- *
- * @ingroup hcrypto_evp
- */
-
-const EVP_CIPHER *
-EVP_cc_aes_128_cbc(void)
-{
- static const EVP_CIPHER c = {
- 0,
- kCCBlockSizeAES128,
- kCCKeySizeAES128,
- kCCBlockSizeAES128,
- EVP_CIPH_CBC_MODE|EVP_CIPH_ALWAYS_CALL_INIT,
- cc_aes_cbc_init,
- cc_do_cipher,
- cc_cleanup,
- sizeof(struct cc_key),
- NULL,
- NULL,
- NULL,
- NULL
- };
- return &c;
-}
-
-/**
- * The AES-192 cipher type (Apple CommonCrypto provider)
- *
- * @return the AES-192-CBC EVP_CIPHER pointer.
- *
- * @ingroup hcrypto_evp
- */
-
-const EVP_CIPHER *
-EVP_cc_aes_192_cbc(void)
-{
- static const EVP_CIPHER c = {
- 0,
- kCCBlockSizeAES128,
- kCCKeySizeAES192,
- kCCBlockSizeAES128,
- EVP_CIPH_CBC_MODE|EVP_CIPH_ALWAYS_CALL_INIT,
- cc_aes_cbc_init,
- cc_do_cipher,
- cc_cleanup,
- sizeof(struct cc_key),
- NULL,
- NULL,
- NULL,
- NULL
- };
- return &c;
-}
-
-/**
- * The AES-256 cipher type (Apple CommonCrypto provider)
- *
- * @return the AES-256-CBC EVP_CIPHER pointer.
- *
- * @ingroup hcrypto_evp
- */
-
-const EVP_CIPHER *
-EVP_cc_aes_256_cbc(void)
-{
- static const EVP_CIPHER c = {
- 0,
- kCCBlockSizeAES128,
- kCCKeySizeAES256,
- kCCBlockSizeAES128,
- EVP_CIPH_CBC_MODE|EVP_CIPH_ALWAYS_CALL_INIT,
- cc_aes_cbc_init,
- cc_do_cipher,
- cc_cleanup,
- sizeof(struct cc_key),
- NULL,
- NULL,
- NULL,
- NULL
- };
- return &c;
-}
-
-/*
- *
- */
-
-#ifdef COMMONCRYPTO_SUPPORTS_RC2
-static int
-cc_rc2_cbc_init(EVP_CIPHER_CTX *ctx,
- const unsigned char * key,
- const unsigned char * iv,
- int encp)
-{
- struct cc_key *cc = ctx->cipher_data;
- return init_cc_key(encp, kCCAlgorithmRC2, key, ctx->cipher->key_len, iv, &cc->href);
-}
-#endif
-
-/**
- * The RC2 cipher type - common crypto
- *
- * @return the RC2 EVP_CIPHER pointer.
- *
- * @ingroup hcrypto_evp
- */
-
-
-const EVP_CIPHER *
-EVP_cc_rc2_cbc(void)
-{
-#ifdef COMMONCRYPTO_SUPPORTS_RC2
- static const EVP_CIPHER rc2_cbc = {
- 0,
- kCCBlockSizeRC2,
- 16,
- kCCBlockSizeRC2,
- EVP_CIPH_CBC_MODE|EVP_CIPH_ALWAYS_CALL_INIT,
- cc_rc2_cbc_init,
- cc_do_cipher,
- cc_cleanup,
- sizeof(struct cc_key),
- NULL,
- NULL,
- NULL,
- NULL
- };
- return &rc2_cbc;
-#else
- return NULL;
-#endif
-}
-
-/**
- * The RC2-40 cipher type - common crypto
- *
- * @return the RC2-40 EVP_CIPHER pointer.
- *
- * @ingroup hcrypto_evp
- */
-
-
-const EVP_CIPHER *
-EVP_cc_rc2_40_cbc(void)
-{
-#ifdef COMMONCRYPTO_SUPPORTS_RC2
- static const EVP_CIPHER rc2_40_cbc = {
- 0,
- kCCBlockSizeRC2,
- 5,
- kCCBlockSizeRC2,
- EVP_CIPH_CBC_MODE|EVP_CIPH_ALWAYS_CALL_INIT,
- cc_rc2_cbc_init,
- cc_do_cipher,
- cc_cleanup,
- sizeof(struct cc_key),
- NULL,
- NULL,
- NULL,
- NULL
- };
- return &rc2_40_cbc;
-#else
- return NULL;
-#endif
-}
-
-
-/**
- * The RC2-64 cipher type - common crypto
- *
- * @return the RC2-64 EVP_CIPHER pointer.
- *
- * @ingroup hcrypto_evp
- */
-
-
-const EVP_CIPHER *
-EVP_cc_rc2_64_cbc(void)
-{
-#ifdef COMMONCRYPTO_SUPPORTS_RC2
- static const EVP_CIPHER rc2_64_cbc = {
- 0,
- kCCBlockSizeRC2,
- 8,
- kCCBlockSizeRC2,
- EVP_CIPH_CBC_MODE|EVP_CIPH_ALWAYS_CALL_INIT,
- cc_rc2_cbc_init,
- cc_do_cipher,
- cc_cleanup,
- sizeof(struct cc_key),
- NULL,
- NULL,
- NULL,
- NULL
- };
- return &rc2_64_cbc;
-#else
- return NULL;
-#endif
-}
-
-/**
- * The CommonCrypto md2 provider
- *
- * @ingroup hcrypto_evp
- */
-
-const EVP_MD *
-EVP_cc_md2(void)
-{
-#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H
- static const struct hc_evp_md md2 = {
--
Samba Shared Repository
More information about the samba-cvs
mailing list