d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts.

Browse Source
This commit is contained in:
nectar 2002-09-16 21:07:11 +00:00
parent a876cfedd8
commit ed53d8e233
7 changed files with 29 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/heimdal/admin/ktutil_locl.h
View File

@ -32,7 +32,7 @@
*/
/*
* $Id: ktutil_locl.h,v 1.17 2001/08/22 20:30:18 assar Exp $
* $Id: ktutil_locl.h,v 1.18 2002/09/10 20:03:45 joda Exp $
* $FreeBSD$
*/
@ -55,12 +55,7 @@
#include <parse_time.h>
#include <roken.h>
#ifdef HAVE_OPENSSL
#include <openssl/des.h>
#else
#include <des.h>
#endif
#include "crypto-headers.h"
#include <krb5.h>
#include <kadm5/admin.h>
#include <kadm5/kadm5_err.h>

8
crypto/heimdal/appl/ftp/ftp/ftp_locl.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*/
/* $Id: ftp_locl.h,v 1.36 2001/08/22 20:30:19 assar Exp $ */
/* $Id: ftp_locl.h,v 1.37 2002/09/10 20:03:46 joda Exp $ */
/* $FreeBSD$ */
#ifndef __FTP_LOCL_H__
@ -132,11 +132,7 @@ struct hostent *gethostbyname(const char *);
#include "security.h"
/* des_read_pw_string */
#ifdef HAVE_OPENSSL
#include <openssl/des.h>
#else
#include <des.h>
#endif
#include "crypto-headers.h"
#if defined(__sun__) && !defined(__svr4)
int fclose(FILE*);

7
crypto/heimdal/kadmin/kadmin_locl.h
View File

@ -32,7 +32,7 @@
*/
/*
* $Id: kadmin_locl.h,v 1.40 2001/08/22 20:30:24 assar Exp $
* $Id: kadmin_locl.h,v 1.41 2002/09/10 20:04:45 joda Exp $
* $FreeBSD$
*/
@ -87,11 +87,6 @@
#endif
#include <err.h>
#include <roken.h>
#ifdef HAVE_OPENSSL
#include <openssl/des.h>
#else
#include <des.h>
#endif
#include <krb5.h>
#include <krb5_locl.h>
#include <hdb.h>

8
crypto/heimdal/kdc/headers.h
View File

@ -32,7 +32,7 @@
*/
/*
* $Id: headers.h,v 1.13 2001/08/22 20:30:25 assar Exp $
* $Id: headers.h,v 1.15 2002/09/10 20:04:46 joda Exp $
* $FreeBSD$
*/
@ -42,6 +42,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -86,11 +87,6 @@
#include <getarg.h>
#include <base64.h>
#include <parse_units.h>
#ifdef HAVE_OPENSSL
#include <openssl/des.h>
#else
#include <des.h>
#endif
#include <krb5.h>
#include <krb5_locl.h>
#include <hdb.h>

8
crypto/heimdal/lib/hdb/hdb_locl.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*/
/* $Id: hdb_locl.h,v 1.17 2001/08/22 20:30:28 assar Exp $ */
/* $Id: hdb_locl.h,v 1.18 2002/09/10 20:03:48 joda Exp $ */
/* $FreeBSD$ */
#ifndef __HDB_LOCL_H__
@ -57,11 +57,7 @@
#endif
#include <roken.h>
#ifdef HAVE_OPENSSL
#include <openssl/des.h>
#else
#include <des.h>
#endif
#include "crypto-headers.h"
#include <krb5.h>
#include <hdb.h>
#include <hdb-private.h>

49
crypto/heimdal/lib/krb5/crypto.c
View File

@ -32,7 +32,7 @@
*/
#include "krb5_locl.h"
RCSID("$Id: crypto.c,v 1.64 2002/04/29 16:31:54 joda Exp $");
RCSID("$Id: crypto.c,v 1.66 2002/09/03 19:58:15 joda Exp $");
/* RCSID("$FreeBSD$"); */
#undef CRYPTO_DEBUG
@ -1677,26 +1677,14 @@ DES3_CBC_encrypt(krb5_context context,
size_t len,
krb5_boolean encrypt,
int usage,
void *ignore_ivec)
void *ivec)
{
des_cblock ivec;
des_cblock local_ivec;
des_key_schedule *s = key->schedule->data;
memset(&ivec, 0, sizeof(ivec));
des_ede3_cbc_encrypt(data, data, len, s[0], s[1], s[2], &ivec, encrypt);
return 0;
}
static krb5_error_code
DES3_CBC_encrypt_ivec(krb5_context context,
struct key_data *key,
void *data,
size_t len,
krb5_boolean encrypt,
int usage,
void *ivec)
{
des_key_schedule *s = key->schedule->data;
if(ivec == NULL) {
ivec = &local_ivec;
memset(local_ivec, 0, sizeof(local_ivec));
}
des_ede3_cbc_encrypt(data, data, len, s[0], s[1], s[2], ivec, encrypt);
return 0;
}
@ -2071,17 +2059,6 @@ static struct encryption_type enctype_des3_cbc_none = {
F_PSEUDO,
DES3_CBC_encrypt,
};
static struct encryption_type enctype_des3_cbc_none_ivec = {
ETYPE_DES3_CBC_NONE_IVEC,
"des3-cbc-none-ivec",
8,
0,
&keytype_des3_derived,
&checksum_none,
NULL,
F_PSEUDO,
DES3_CBC_encrypt_ivec,
};
static struct encryption_type *etypes[] = {
&enctype_null,
@ -2095,8 +2072,7 @@ static struct encryption_type *etypes[] = {
&enctype_des_cbc_none,
&enctype_des_cfb64_none,
&enctype_des_pcbc_none,
&enctype_des3_cbc_none,
&enctype_des3_cbc_none_ivec
&enctype_des3_cbc_none
};
static unsigned num_etypes = sizeof(etypes) / sizeof(etypes[0]);
@ -3057,6 +3033,15 @@ krb5_crypto_destroy(krb5_context context,
return 0;
}
krb5_error_code
krb5_crypto_getblocksize(krb5_context context,
krb5_crypto crypto,
size_t *blocksize)
{
*blocksize = crypto->et->blocksize;
return 0;
}
krb5_error_code
krb5_string_to_key_derived(krb5_context context,
const void *str,

17
crypto/heimdal/lib/krb5/krb5_locl.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*/
/* $Id: krb5_locl.h,v 1.69 2002/08/12 15:09:19 joda Exp $ */
/* $Id: krb5_locl.h,v 1.71 2002/09/10 20:10:45 joda Exp $ */
/* $FreeBSD$ */
#ifndef __KRB5_LOCL_H__
@ -46,6 +46,7 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@ -113,19 +114,7 @@ struct sockaddr_dl;
#include <parse_time.h>
#include <base64.h>
#ifdef HAVE_OPENSSL
#include <openssl/des.h>
#include <openssl/md4.h>
#include <openssl/md5.h>
#include <openssl/sha.h>
#include <openssl/rc4.h>
#else
#include <des.h>
#include <md4.h>
#include <md5.h>
#include <sha.h>
#include <rc4.h>
#endif
#include "crypto-headers.h"
#include <krb5_asn1.h>
#include <der.h>