| krb5_locl.h (57428) | krb5_locl.h (72448) |
|---|---|
| 1/* | 1/* |
| 2 * Copyright (c) 1997-1999 Kungliga Tekniska H�gskolan | 2 * Copyright (c) 1997-2001 Kungliga Tekniska H�gskolan |
| 3 * (Royal Institute of Technology, Stockholm, Sweden). 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: 9 * 10 * 1. Redistributions of source code must retain the above copyright --- 16 unchanged lines hidden (view full) --- 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 */ 33 34/* $Id: krb5_locl.h,v 1.63 1999/12/02 17:05:11 joda Exp $ */ | 3 * (Royal Institute of Technology, Stockholm, Sweden). 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: 9 * 10 * 1. Redistributions of source code must retain the above copyright --- 16 unchanged lines hidden (view full) --- 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 */ 33 34/* $Id: krb5_locl.h,v 1.63 1999/12/02 17:05:11 joda Exp $ */ |
| 35/* $FreeBSD: head/crypto/heimdal/lib/krb5/krb5_locl.h 57428 2000-02-24 13:37:41Z markm $ */ | 35/* $FreeBSD: head/crypto/heimdal/lib/krb5/krb5_locl.h 72448 2001-02-13 16:52:56Z assar $ */ |
| 36 37#ifndef __KRB5_LOCL_H__ 38#define __KRB5_LOCL_H__ 39 40#ifdef HAVE_CONFIG_H 41#include <config.h> 42#endif 43 --- 61 unchanged lines hidden (view full) --- 105#endif 106#ifdef HAVE_SYS_FILIO_H 107#include <sys/filio.h> 108#endif 109#include <roken.h> 110#include <parse_time.h> 111#include <base64.h> 112 | 36 37#ifndef __KRB5_LOCL_H__ 38#define __KRB5_LOCL_H__ 39 40#ifdef HAVE_CONFIG_H 41#include <config.h> 42#endif 43 --- 61 unchanged lines hidden (view full) --- 105#endif 106#ifdef HAVE_SYS_FILIO_H 107#include <sys/filio.h> 108#endif 109#include <roken.h> 110#include <parse_time.h> 111#include <base64.h> 112 |
| 113<<<<<<< krb5_locl.h |
|
| 113#include <openssl/des.h> | 114#include <openssl/des.h> |
| 115======= 116#ifdef HAVE_OPENSSL_DES_H 117#include <openssl/des.h> 118#else 119#include <des.h> 120#endif 121#ifdef HAVE_OPENSSL_MD4_H 122#include <openssl/md4.h> 123#else 124>>>>>>> 1.1.1.2 |
|
| 114#include <md4.h> | 125#include <md4.h> |
| 126#endif 127#ifdef HAVE_OPENSSL_MD5_H 128#include <openssl/md5.h> 129#else |
|
| 115#include <md5.h> | 130#include <md5.h> |
| 131#endif 132#ifdef HAVE_OPENSSL_SHA_H 133#include <openssl/sha.h> 134#else |
|
| 116#include <sha.h> | 135#include <sha.h> |
| 136#endif 137#ifdef HAVE_OPENSSL_RC4_H 138#include <openssl/rc4.h> 139#else |
|
| 117#include <rc4.h> | 140#include <rc4.h> |
| 141#endif |
|
| 118 119#include <asn1.h> 120#include <der.h> 121 122#include <krb5.h> 123#include <krb5_err.h> 124#include <asn1_err.h> 125#include <krb5-private.h> --- 12 unchanged lines hidden --- | 142 143#include <asn1.h> 144#include <der.h> 145 146#include <krb5.h> 147#include <krb5_err.h> 148#include <asn1_err.h> 149#include <krb5-private.h> --- 12 unchanged lines hidden --- |