Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update generated heimdal include files for 0.3f 

update Makefile infrastructure for 0.3f
bump shared library versions
fix some merge problems
This commit is contained in:
assar 2001-06-20 02:01:18 +00:00
parent 0b0010a7c3
commit 4b1c7f1857
12 changed files with 82 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/dist/heimdal/kpasswd/kpasswdd.c vendored
View File

@ -32,7 +32,7 @@
*/
#include "kpasswd_locl.h"
RCSID("$Id: kpasswdd.c,v 1.4 2001/06/19 22:39:56 assar Exp $");
RCSID("$Id: kpasswdd.c,v 1.5 2001/06/20 02:01:19 assar Exp $");
#include <kadm5/admin.h>
@ -547,7 +547,7 @@ doit (krb5_keytab keytab, int port)
ret2 = get_local_addr(sa, addrlen, localsa, &loclen);
if (ret2 < 0)
krb5_errx (context, errno, "get_local_addr");
ret2 = krb5_sockaddr2address(localsa, &my_addr);
ret2 = krb5_sockaddr2address(context, localsa, &my_addr);
if (ret2)
krb5_errx (context, ret2,
"krb5_sockaddr2address");

25
crypto/dist/heimdal/lib/krb5/crypto.c vendored
View File

@ -32,7 +32,7 @@
*/
#include "krb5_locl.h"
RCSID("$Id: crypto.c,v 1.5 2001/06/19 22:39:58 assar Exp $");
RCSID("$Id: crypto.c,v 1.6 2001/06/20 02:01:19 assar Exp $");
#undef CRYPTO_DEBUG
#ifdef CRYPTO_DEBUG
@ -448,11 +448,11 @@ ARCFOUR_string_to_key(krb5_context context,
*p++ = ((char *)password.data)[i];
*p++ = 0;
}
MD4Init (&m);
MD4Update (&m, s, len);
MD4_Init (&m);
MD4_Update (&m, s, len);
key->keytype = enctype;
krb5_data_alloc (&key->keyvalue, 16);
MD4Final (key->keyvalue.data, &m);
MD4_Final (key->keyvalue.data, &m);
memset (s, 0, len);
free (s);
return 0;
@ -872,9 +872,9 @@ RSA_MD4_checksum(krb5_context context,
{
MD4_CTX m;
MD4Init (&m);
MD4Update (&m, data, len);
MD4Final (C->checksum.data, &m);
MD4_Init (&m);
MD4_Update (&m, data, len);
MD4_Final (C->checksum.data, &m);
}
static void
@ -890,10 +890,10 @@ RSA_MD4_DES_checksum(krb5_context context,
unsigned char *p = cksum->checksum.data;
krb5_generate_random_block(p, 8);
MD4Init (&md4);
MD4Update (&md4, p, 8);
MD4Update (&md4, data, len);
MD4Final (p + 8, &md4);
MD4_Init (&md4);
MD4_Update (&md4, p, 8);
MD4_Update (&md4, data, len);
MD4_Final (p + 8, &md4);
memset (&ivec, 0, sizeof(ivec));
des_cbc_encrypt((const void *)p,
(void *)p,
@ -2664,7 +2664,6 @@ static int
seed_something(void)
{
int fd = -1;
size_t len;
char buf[1024], seedfile[256];
/* If there is a seed file, load it. But such a file cannot be trusted,
@ -2684,7 +2683,7 @@ seed_something(void)
we do not have to deal with it. */
if (RAND_status() != 1) {
krb5_context context;
char *p;
const char *p;
/* Try using egd */
if (!krb5_init_context(&context)) {

33
include/heimdal/config.h
View File

@ -89,6 +89,12 @@
/* Define if you have the <bsdsetjmp.h> header file. */
/* #undef HAVE_BSDSETJMP_H */
/* Define if you have the `bswap16' function. */
#define HAVE_BSWAP16 1
/* Define if you have the `bswap32' function. */
#define HAVE_BSWAP32 1
/* Define if you have the <capability.h> header file. */
/* #undef HAVE_CAPABILITY_H */
@ -259,6 +265,9 @@
/* Define if you have the `getopt' function. */
#define HAVE_GETOPT 1
/* Define if you have the `getprogname' function. */
/* #undef HAVE_GETPROGNAME */
/* Define if you have the `getpwnam_r' function. */
/* #undef HAVE_GETPWNAM_R */
@ -284,7 +293,7 @@
#define HAVE_GETUSERSHELL 1
/* define if you have a glob() that groks GLOB_BRACE, GLOB_NOCHECK,
GLOB_QUOTE, and GLOB_TILDE */
GLOB_QUOTE, and GLOB_TILDE, and GLOB_LIMIT */
#define HAVE_GLOB 1
/* Define if you have the `grantpt' function. */
@ -377,9 +386,6 @@
/* Define if you have the `memmove' function. */
#define HAVE_MEMMOVE 1
/* Define if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define if you have the `mkstemp' function. */
#define HAVE_MKSTEMP 1
@ -432,7 +438,7 @@
#define HAVE_OPENSSL_DES_H 1
/* Define if you have the <openssl/md4.h> header file. */
/* #undef HAVE_OPENSSL_MD4_H */
#define HAVE_OPENSSL_MD4_H 1
/* Define if you have the <openssl/md5.h> header file. */
#define HAVE_OPENSSL_MD5_H 1
@ -557,6 +563,9 @@
/* Define if you have the `setproctitle' function. */
#define HAVE_SETPROCTITLE 1
/* Define if you have the `setprogname' function. */
#define HAVE_SETPROGNAME 1
/* Define if you have the `setregid' function. */
#define HAVE_SETREGID 1
@ -611,9 +620,6 @@
/* Define if you have the <standards.h> header file. */
/* #undef HAVE_STANDARDS_H */
/* Define if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define if you have the `strcasecmp' function. */
#define HAVE_STRCASECMP 1
@ -626,12 +632,6 @@
/* Define if you have the `strftime' function. */
#define HAVE_STRFTIME 1
/* Define if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define if you have the `strlcat' function. */
#define HAVE_STRLCAT 1
@ -755,6 +755,9 @@
/* Define if you have the <sys/bitypes.h> header file. */
/* #undef HAVE_SYS_BITYPES_H */
/* Define if you have the <sys/bswap.h> header file. */
#define HAVE_SYS_BSWAP_H 1
/* Define if you have the <sys/capability.h> header file. */
/* #undef HAVE_SYS_CAPABILITY_H */
@ -1120,7 +1123,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
#define VERSION "0.3e"
#define VERSION "0.3f"
/* Define if signal handlers return void. */
#define VOID_RETSIGTYPE 1

5
include/heimdal/roken.h
View File

@ -38,7 +38,7 @@
* SUCH DAMAGE.
*/
/* $Id: roken.h,v 1.4 2001/02/11 17:55:16 assar Exp $ */
/* $Id: roken.h,v 1.5 2001/06/20 02:01:18 assar Exp $ */
#include <stdio.h>
#include <stdlib.h>
@ -47,6 +47,7 @@
#include <signal.h>
#include <sys/param.h>
#include <inttypes.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/socket.h>
@ -220,6 +221,6 @@ void set_progname(char *argv0);
const char *get_progname(void);
ROKEN_CPP_END
#define ROKEN_VERSION 0.3e
#define ROKEN_VERSION 0.3f
#endif /* __ROKEN_H__ */

6
include/heimdal/version.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: version.h,v 1.8 2001/02/11 17:55:16 assar Exp $ */
/* $NetBSD: version.h,v 1.9 2001/06/20 02:01:18 assar Exp $ */
#if defined(__KRB5_VERSION) && !defined(__NO_KRB4_VERSION)
#define heimdal_long_version __heimdal_long_version
@ -13,8 +13,8 @@
#endif
#ifndef __NO_KRB5_VERSION
const char *heimdal_long_version = "@(#)$Version: heimdal-0.3e (NetBSD) $";
const char *heimdal_version = "heimdal-0.3e";
const char *heimdal_long_version = "@(#)$Version: heimdal-0.3f (NetBSD) $";
const char *heimdal_version = "heimdal-0.3f";
#endif
#ifndef __NO_KRB4_VERSION

14
lib/libasn1/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2000/12/30 17:21:44 sommerfeld Exp $
# $NetBSD: Makefile,v 1.10 2001/06/20 02:01:18 assar Exp $
.include <bsd.own.mk>
@ -17,7 +17,7 @@ asn1_err.h asn1_err.c: asn1_err.et
DPSRCS= asn1_err.h
INCS= asn1.h asn1_err.h
INCS= krb5_asn1.h asn1_err.h
INCSDIR= /usr/include/krb5
@ -36,6 +36,7 @@ gen_files = \
asn1_AuthorizationData.x \
asn1_CKSUMTYPE.x \
asn1_Checksum.x \
asn1_ENCTYPE.x \
asn1_ETYPE_INFO.x \
asn1_ETYPE_INFO_ENTRY.x \
asn1_EncAPRepPart.x \
@ -61,6 +62,7 @@ gen_files = \
asn1_KerberosTime.x \
asn1_KrbCredInfo.x \
asn1_LastReq.x \
asn1_LR_TYPE.x \
asn1_MESSAGE_TYPE.x \
asn1_METHOD_DATA.x \
asn1_NAME_TYPE.x \
@ -93,17 +95,17 @@ CPPFLAGS+= -I. \
-I${DIST}/heimdal/lib/com_err \
-DHAVE_CONFIG_H
${gen_files} asn1.hx: asn1_files
${gen_files} krb5_asn1.hx: asn1_files
ASN1COMPILE!= cd ${.CURDIR}/asn1_compile && ${PRINTOBJDIR}
ASN1_COMPILE= ${ASN1COMPILE}/asn1_compile
asn1_files: k5.asn1 all-asn1_compile
${ASN1_COMPILE} ${DIST}/heimdal/lib/asn1/k5.asn1
${ASN1_COMPILE} ${DIST}/heimdal/lib/asn1/k5.asn1 krb5_asn1
${SRCS}: asn1.h
${SRCS}: krb5_asn1.h
CLEANFILES = ${BUILT_SOURCES} ${gen_files} asn1_files asn1.h asn1.hx
CLEANFILES = ${BUILT_SOURCES} ${gen_files} asn1_files krb5_asn1.h krb5_asn1.hx
SUBDIR= asn1_compile

29
lib/libasn1/asn1_compile/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2000/12/30 17:21:45 sommerfeld Exp $
# $NetBSD: Makefile,v 1.8 2001/06/20 02:01:18 assar Exp $
NOMAN= noman
@ -12,10 +12,29 @@ MKLINT= no
HOSTPROG= asn1_compile
SRCS= parse.y lex.l main.c hash.c symbol.c gen.c \
gen_encode.c gen_decode.c gen_free.c gen_length.c gen_copy.c \
gen_glue.c \
getarg.c print_version.c warnerr.c strupr.c get_window_size.c
asn1_compile_SRCS = \
gen.c \
gen_copy.c \
gen_decode.c \
gen_encode.c \
gen_free.c \
gen_glue.c \
gen_length.c \
hash.c \
lex.l \
main.c \
parse.y \
symbol.c
roken_SRCS = \
getarg.c \
print_version.c \
warnerr.c \
strupr.c \
get_window_size.c
SRCS= $(asn1_compile_SRCS) \
$(roken_SRCS)
YHEADER= 1

2
lib/libasn1/shlib_version
View File

@ -1,2 +1,2 @@
major=5
major=6
minor=0

2
lib/libcom_err/shlib_version
View File

@ -1,2 +1,2 @@
major=4
minor=0
minor=1

13
lib/libkrb5/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2001/04/12 05:59:25 itojun Exp $
# $NetBSD: Makefile,v 1.12 2001/06/20 02:01:19 assar Exp $
.include <bsd.own.mk>
@ -48,6 +48,7 @@ SRCS= \
crypto.c \
data.c \
eai_to_heim_errno.c \
error_string.c \
expand_hostname.c \
fcache.c \
free.c \
@ -69,6 +70,7 @@ SRCS= \
init_creds_pw.c \
keyblock.c \
keytab.c \
keytab_any.c \
keytab_file.c \
keytab_memory.c \
keytab_keyfile.c \
@ -126,22 +128,23 @@ INCS= krb5.h \
krb5-types.h
MAN= \
kerberos.8 \
krb5.conf.5 \
krb5_425_conv_principal.3 \
krb5_appdefault.3 \
krb5_auth_context.3 \
krb5_build_principal.3 \
krb5_config.3 \
krb5_context.3 \
krb5_free_principal.3 \
krb5_init_context.3 \
krb5_keytab.3 \
krb5_openlog.3 \
krb5_parse_name.3 \
krb5_sname_to_principal.3 \
krb5_unparse_name.3 \
krb5_warn.3 \
kerberos.8 \
verify_krb5_conf.8 \
krb5_auth_context.3 \
krb5_context.3 \
krb5_init_context.3 \
krb5-types.h:
cp ${.CURDIR}/../../include/heimdal/$@ $@

2
lib/libkrb5/shlib_version
View File

@ -1,2 +1,2 @@
major=16
major=17
minor=0

2
lib/libroken/shlib_version
View File

@ -1,2 +1,2 @@
major=12
minor=0
minor=1