oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

delete crypto_headers.h, use global file instead

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16560 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-01-13 14:02:49 +00:00
parent a88ee830b5
commit 163c6cb7b5
9 changed files with 6 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hx509/ChangeLog
View File

@@ -1,5 +1,7 @@
2006-01-13 Love H<>rnquist <20>strand <lha@it.su.se> 2006-01-13 Love H<>rnquist <20>strand <lha@it.su.se>
* delete crypto_headers.h, use global file instead.
* crypto.c (PBE_string2key): libdes now supports PKCS12_key_gen * crypto.c (PBE_string2key): libdes now supports PKCS12_key_gen
2006-01-12 Love H<>rnquist <20>strand <lha@it.su.se> 2006-01-12 Love H<>rnquist <20>strand <lha@it.su.se>

2
lib/hx509/cert.c
View File

@@ -33,7 +33,7 @@
#include "hx_locl.h" #include "hx_locl.h"
RCSID("$Id$"); RCSID("$Id$");
#include "crypto_headers.h" #include "crypto-headers.h"
struct hx509_verify_ctx_data { struct hx509_verify_ctx_data {

1
lib/hx509/collector.c
View File

@@ -33,7 +33,6 @@
#include "hx_locl.h" #include "hx_locl.h"
RCSID("$Id$"); RCSID("$Id$");
#include "crypto_headers.h"
struct private_key { struct private_key {
AlgorithmIdentifier alg; AlgorithmIdentifier alg;

3
lib/hx509/crypto.c
View File

@@ -34,9 +34,6 @@
#include "hx_locl.h" #include "hx_locl.h"
RCSID("$Id$"); RCSID("$Id$");
#include "crypto_headers.h"
#define pkcs1(name, number) \ #define pkcs1(name, number) \
static unsigned name##_oid_data[] = { 1, 2, 840, 113549, 1, 1, number }; \ static unsigned name##_oid_data[] = { 1, 2, 840, 113549, 1, 1, number }; \
static heim_oid name##_oid = { 7, name##_oid_data } static heim_oid name##_oid = { 7, name##_oid_data }

39
lib/hx509/crypto_headers.h
View File

@@ -1,39 +0,0 @@
/*
* $Id$
*/
#ifdef HAVE_OPENSSL
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/err.h>
#include <openssl/sha.h>
#include <openssl/md5.h>
#include <openssl/md2.h>
#include <openssl/pem.h>
#include <openssl/evp.h>
#include <openssl/rand.h>
#include <openssl/asn1.h>
#include <openssl/asn1t.h>
#include <openssl/ui.h>
#include <openssl/pkcs12.h>
#include <openssl/engine.h>
#ifndef BN_is_negative
#define BN_set_negative(bn, flag) ((bn)->neg = (flag) ? 1 : 0)
#define BN_is_negative(bn) ((bn)->neg != 0)
#endif
#else
#include <rsa.h>
#include <dsa.h>
#include <sha.h>
#include <md5.h>
#include <md2.h>
#include <evp.h>
#include <rand.h>
#include <ui.h>
#include <engine.h>
#endif

2
lib/hx509/hx_locl.h
View File

@@ -58,6 +58,8 @@
#include <der.h> #include <der.h>
#include "crypto-headers.h"
struct hx509_query_data; struct hx509_query_data;
typedef struct hx509_query_data hx509_query; typedef struct hx509_query_data hx509_query;

2
lib/hx509/ks_p11.c
View File

@@ -35,8 +35,6 @@
RCSID("$Id$"); RCSID("$Id$");
#include <dlfcn.h> #include <dlfcn.h>
#include "crypto_headers.h"
#include "pkcs11u.h" #include "pkcs11u.h"
#include "pkcs11.h" #include "pkcs11.h"

2
lib/hx509/ks_p12.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004 - 2005 Kungliga Tekniska H<>gskolan * Copyright (c) 2004 - 2006 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *

1
lib/hx509/lock.c
View File

@@ -33,7 +33,6 @@
#include "hx_locl.h" #include "hx_locl.h"
RCSID("$Id$"); RCSID("$Id$");
#include "crypto_headers.h"
struct hx509_lock_data { struct hx509_lock_data {
struct _hx509_password password; struct _hx509_password password;