Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/heimdal/dist Import latest heimdal-1-5-b...
details: https://anonhg.NetBSD.org/src/rev/aec9ab84f376
branches: trunk
changeset: 795678:aec9ab84f376
user: pettai <pettai%NetBSD.org@localhost>
date: Thu Apr 24 13:45:33 2014 +0000
description:
Import latest heimdal-1-5-branch, merge conflicts
Ok'ed and reviewed by elric@
diffstat:
crypto/external/bsd/heimdal/dist/admin/ktutil.8 | 97 +-
crypto/external/bsd/heimdal/dist/base/baselocl.h | 9 +-
crypto/external/bsd/heimdal/dist/kadmin/get.c | 14 +-
crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 | 108 ++--
crypto/external/bsd/heimdal/dist/kadmin/kadmind.8 | 80 +-
crypto/external/bsd/heimdal/dist/kadmin/util.c | 6 +-
crypto/external/bsd/heimdal/dist/kcm/kcm.8 | 127 ++--
crypto/external/bsd/heimdal/dist/kdc/hprop.8 | 94 +-
crypto/external/bsd/heimdal/dist/kdc/hpropd.8 | 76 +-
crypto/external/bsd/heimdal/dist/kdc/kdc.8 | 113 ++--
crypto/external/bsd/heimdal/dist/kdc/kerberos5.c | 267 ++++++---
crypto/external/bsd/heimdal/dist/kdc/kstash.8 | 76 +-
crypto/external/bsd/heimdal/dist/kdc/string2key.8 | 84 +-
crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.8 | 80 +-
crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.c | 114 ++-
crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1 | 31 +-
crypto/external/bsd/heimdal/dist/kuser/kdestroy.1 | 72 +-
crypto/external/bsd/heimdal/dist/kuser/kgetcred.1 | 76 +-
crypto/external/bsd/heimdal/dist/kuser/kimpersonate.8 | 104 +-
crypto/external/bsd/heimdal/dist/kuser/kinit.1 | 140 ++--
crypto/external/bsd/heimdal/dist/kuser/klist.1 | 82 +-
crypto/external/bsd/heimdal/dist/kuser/klist.c | 18 +-
crypto/external/bsd/heimdal/dist/lib/asn1/gen.c | 10 +-
crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3 | 4 +-
crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c | 8 +-
crypto/external/bsd/heimdal/dist/lib/gssapi/gss_acquire_cred.3 | 2 +-
crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi.3 | 52 +-
crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c | 30 +-
crypto/external/bsd/heimdal/dist/lib/gssapi/mech/mech.5 | 6 +-
crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c | 6 +-
crypto/external/bsd/heimdal/dist/lib/hdb/hdb.c | 14 +-
crypto/external/bsd/heimdal/dist/lib/hx509/cert.c | 115 ++-
crypto/external/bsd/heimdal/dist/lib/hx509/revoke.c | 51 +-
crypto/external/bsd/heimdal/dist/lib/hx509/sel.h | 4 +-
crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c | 20 +-
crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8 | 108 ++-
crypto/external/bsd/heimdal/dist/lib/kadm5/iprop.8 | 52 +-
crypto/external/bsd/heimdal/dist/lib/krb5/auth_context.c | 6 +-
crypto/external/bsd/heimdal/dist/lib/krb5/context.c | 194 +++---
crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c | 8 +-
crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 | 38 +-
crypto/external/bsd/heimdal/dist/lib/krb5/krb524_convert_creds_kdc.3 | 2 +-
crypto/external/bsd/heimdal/dist/lib/krb5/krb5_c_make_checksum.3 | 6 +-
crypto/external/bsd/heimdal/dist/lib/krb5/krb5_get_in_cred.3 | 2 +-
crypto/external/bsd/heimdal/dist/lib/krb5/krb5_init_context.3 | 10 +-
crypto/external/bsd/heimdal/dist/lib/krb5/krb5_is_thread_safe.3 | 2 +-
crypto/external/bsd/heimdal/dist/lib/krb5/krb5_principal.3 | 4 +-
crypto/external/bsd/heimdal/dist/lib/krb5/krb5_string_to_key.3 | 2 +-
crypto/external/bsd/heimdal/dist/lib/krb5/salt.c | 4 +-
crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c | 102 +++-
crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map | 3 +-
crypto/external/bsd/heimdal/dist/lib/roken/get_window_size.c | 16 +-
crypto/external/bsd/heimdal/dist/lib/roken/getarg.c | 19 +-
crypto/external/bsd/heimdal/dist/lib/roken/resolve.c | 29 +-
crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in | 23 +-
crypto/external/bsd/heimdal/dist/lib/roken/rtbl.3 | 2 +-
crypto/external/bsd/heimdal/dist/lib/vers/print_version.c | 2 +-
57 files changed, 1542 insertions(+), 1282 deletions(-)
diffs (truncated from 5787 to 300 lines):
diff -r b506835e57d3 -r aec9ab84f376 crypto/external/bsd/heimdal/dist/admin/ktutil.8
--- a/crypto/external/bsd/heimdal/dist/admin/ktutil.8 Thu Apr 24 12:45:26 2014 +0000
+++ b/crypto/external/bsd/heimdal/dist/admin/ktutil.8 Thu Apr 24 13:45:33 2014 +0000
@@ -1,36 +1,36 @@
-.\" $NetBSD: ktutil.8,v 1.2 2011/04/14 19:19:19 elric Exp $
+.\" $NetBSD: ktutil.8,v 1.3 2014/04/24 13:45:33 pettai Exp $
.\"
.\" Copyright (c) 1997-2004 Kungliga Tekniska Högskolan
-.\" (Royal Institute of Technology, Stockholm, Sweden).
-.\" All rights reserved.
+.\" (Royal Institute of Technology, Stockholm, Sweden).
+.\" All rights reserved.
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
+.\" 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.
+.\" 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.
+.\" 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.
+.\" 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.
-.\"
+.\" 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.
+.\"
.\" Id
.\"
.Dd April 14, 2005
@@ -42,12 +42,12 @@
.Sh SYNOPSIS
.Nm
.Oo Fl k Ar keytab \*(Ba Xo
-.Fl -keytab= Ns Ar keytab
+.Fl Fl keytab= Ns Ar keytab
.Xc
.Oc
-.Op Fl v | Fl -verbose
-.Op Fl -version
-.Op Fl h | Fl -help
+.Op Fl v | Fl Fl verbose
+.Op Fl Fl version
+.Op Fl h | Fl Fl help
.Ar command
.Op Ar args
.Sh DESCRIPTION
@@ -56,26 +56,27 @@
Supported options:
.Bl -tag -width Ds
.It Fl v , Fl -verbose
+.It Fl v , Fl Fl verbose
Verbose output.
.El
.Pp
.Ar command
can be one of the following:
.Bl -tag -width srvconvert
-.It add Oo Fl p Ar principal Oc Oo Fl -principal= Ns Ar principal Oc \
-Oo Fl V Ar kvno Oc Oo Fl -kvno= Ns Ar kvno Oc Oo Fl e Ar enctype Oc \
-Oo Fl -enctype= Ns Ar enctype Oc Oo Fl w Ar password Oc \
-Oo Fl -password= Ns Ar password Oc Oo Fl r Oc Oo Fl -random Oc \
-Oo Fl s Oc Oo Fl -no-salt Oc Oo Fl H Oc Op Fl -hex
+.It add Oo Fl p Ar principal Oc Oo Fl Fl principal= Ns Ar principal Oc \
+Oo Fl V Ar kvno Oc Oo Fl Fl kvno= Ns Ar kvno Oc Oo Fl e Ar enctype Oc \
+Oo Fl Fl enctype= Ns Ar enctype Oc Oo Fl w Ar password Oc \
+Oo Fl Fl password= Ns Ar password Oc Oo Fl r Oc Oo Fl Fl random Oc \
+Oo Fl s Oc Oo Fl Fl no-salt Oc Oo Fl H Oc Op Fl Fl hex
Adds a key to the keytab. Options that are not specified will be
prompted for. This requires that you know the password or the hex key of the
principal to add; if what you really want is to add a new principal to
the keytab, you should consider the
.Ar get
command, which talks to the kadmin server.
-.It change Oo Fl r Ar realm Oc Oo Fl -realm= Ns Ar realm Oc \
-Oo Fl -a Ar host Oc Oo Fl -admin-server= Ns Ar host Oc \
-Oo Fl -s Ar port Oc Op Fl -server-port= Ns Ar port
+.It change Oo Fl r Ar realm Oc Oo Fl Fl realm= Ns Ar realm Oc \
+Oo Fl Fl a Ar host Oc Oo Fl Fl admin-server= Ns Ar host Oc \
+Oo Fl Fl s Ar port Oc Op Fl Fl server-port= Ns Ar port
Update one or several keys to new versions. By default, use the admin
server for the realm of a keytab entry. Otherwise it will use the
values specified by the options.
@@ -87,11 +88,11 @@
to
.Ar keytab-dest .
.It get Oo Fl p Ar admin principal Oc \
-Oo Fl -principal= Ns Ar admin principal Oc Oo Fl e Ar enctype Oc \
-Oo Fl -enctypes= Ns Ar enctype Oc Oo Fl r Ar realm Oc \
-Oo Fl -realm= Ns Ar realm Oc Oo Fl a Ar admin server Oc \
-Oo Fl -admin-server= Ns Ar admin server Oc Oo Fl s Ar server port Oc \
-Oo Fl -server-port= Ns Ar server port Oc Ar principal ...
+Oo Fl Fl principal= Ns Ar admin principal Oc Oo Fl e Ar enctype Oc \
+Oo Fl Fl enctypes= Ns Ar enctype Oc Oo Fl r Ar realm Oc \
+Oo Fl Fl realm= Ns Ar realm Oc Oo Fl a Ar admin server Oc \
+Oo Fl Fl admin-server= Ns Ar admin server Oc Oo Fl s Ar server port Oc \
+Oo Fl Fl server-port= Ns Ar server port Oc Ar principal ...
For each
.Ar principal ,
generate a new key for it (creating it if it doesn't already exist),
@@ -101,11 +102,11 @@
.Ar realm
is specified, the realm to operate on is taken from the first
principal.
-.It list Oo Fl -keys Oc Op Fl -timestamp
+.It list Oo Fl Fl keys Oc Op Fl Fl timestamp
List the keys stored in the keytab.
-.It remove Oo Fl p Ar principal Oc Oo Fl -principal= Ns Ar principal Oc \
-Oo Fl V kvno Oc Oo Fl -kvno= Ns Ar kvno Oc Oo Fl e enctype Oc \
-Oo Fl -enctype= Ns Ar enctype Oc
+.It remove Oo Fl p Ar principal Oc Oo Fl Fl principal= Ns Ar principal Oc \
+Oo Fl V kvno Oc Oo Fl Fl kvno= Ns Ar kvno Oc Oo Fl e enctype Oc \
+Oo Fl Fl enctype= Ns Ar enctype Oc
Removes the specified key or keys. Not specifying a
.Ar kvno
removes keys with any version number. Not specifying an
@@ -116,7 +117,7 @@
.Ar from-principal
to
.Ar to-principal .
-.It purge Op Fl -age= Ns Ar age
+.It purge Op Fl Fl age= Ns Ar age
Removes all old versions of a key for which there is a newer version
that is at least
.Ar age
diff -r b506835e57d3 -r aec9ab84f376 crypto/external/bsd/heimdal/dist/base/baselocl.h
--- a/crypto/external/bsd/heimdal/dist/base/baselocl.h Thu Apr 24 12:45:26 2014 +0000
+++ b/crypto/external/bsd/heimdal/dist/base/baselocl.h Thu Apr 24 13:45:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: baselocl.h,v 1.2 2011/04/16 17:45:44 martin Exp $ */
+/* $NetBSD: baselocl.h,v 1.3 2014/04/24 13:45:33 pettai Exp $ */
/*
* Copyright (c) 2010 Kungliga Tekniska Högskolan
@@ -37,6 +37,13 @@
#include "config.h"
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff -r b506835e57d3 -r aec9ab84f376 crypto/external/bsd/heimdal/dist/kadmin/get.c
--- a/crypto/external/bsd/heimdal/dist/kadmin/get.c Thu Apr 24 12:45:26 2014 +0000
+++ b/crypto/external/bsd/heimdal/dist/kadmin/get.c Thu Apr 24 13:45:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: get.c,v 1.2 2011/04/21 17:58:56 christos Exp $ */
+/* $NetBSD: get.c,v 1.3 2014/04/24 13:45:33 pettai Exp $ */
/*
* Copyright (c) 1997-2006 Kungliga Tekniska Högskolan
@@ -173,23 +173,23 @@
case KADM5_PRINC_EXPIRE_TIME:
time_t2str(princ->princ_expire_time, buf, buf_len, !condensed);
break;
-
+
case KADM5_PW_EXPIRATION:
time_t2str(princ->pw_expiration, buf, buf_len, !condensed);
break;
-
+
case KADM5_LAST_PWD_CHANGE:
time_t2str(princ->last_pwd_change, buf, buf_len, !condensed);
break;
-
+
case KADM5_MAX_LIFE:
deltat2str(princ->max_life, buf, buf_len);
break;
-
+
case KADM5_MAX_RLIFE:
deltat2str(princ->max_renewable_life, buf, buf_len);
break;
-
+
case KADM5_MOD_TIME:
time_t2str(princ->mod_date, buf, buf_len, !condensed);
break;
@@ -491,7 +491,7 @@
ret = setup_columns(&data, DEFAULT_COLUMNS_SHORT);
} else
ret = setup_columns(&data, opt->column_info_string);
-
+
if(ret != 0) {
if(data.table != NULL)
rtbl_destroy(data.table);
diff -r b506835e57d3 -r aec9ab84f376 crypto/external/bsd/heimdal/dist/kadmin/kadmin.8
--- a/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 Thu Apr 24 12:45:26 2014 +0000
+++ b/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 Thu Apr 24 13:45:33 2014 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: kadmin.8,v 1.2 2011/04/14 19:19:19 elric Exp $
+.\" $NetBSD: kadmin.8,v 1.3 2014/04/24 13:45:33 pettai Exp $
.\"
.\" Copyright (c) 2000 - 2007 Kungliga Tekniska Högskolan
.\" (Royal Institute of Technology, Stockholm, Sweden).
@@ -42,16 +42,16 @@
.Sh SYNOPSIS
.Nm
.Bk -words
-.Op Fl p Ar string \*(Ba Fl -principal= Ns Ar string
-.Op Fl K Ar string \*(Ba Fl -keytab= Ns Ar string
-.Op Fl c Ar file \*(Ba Fl -config-file= Ns Ar file
-.Op Fl k Ar file \*(Ba Fl -key-file= Ns Ar file
-.Op Fl r Ar realm \*(Ba Fl -realm= Ns Ar realm
-.Op Fl a Ar host \*(Ba Fl -admin-server= Ns Ar host
-.Op Fl s Ar port number \*(Ba Fl -server-port= Ns Ar port number
-.Op Fl l | Fl -local
-.Op Fl h | Fl -help
-.Op Fl v | Fl -version
+.Op Fl p Ar string \*(Ba Fl Fl principal= Ns Ar string
+.Op Fl K Ar string \*(Ba Fl Fl keytab= Ns Ar string
+.Op Fl c Ar file \*(Ba Fl Fl config-file= Ns Ar file
+.Op Fl k Ar file \*(Ba Fl Fl key-file= Ns Ar file
+.Op Fl r Ar realm \*(Ba Fl Fl realm= Ns Ar realm
+.Op Fl a Ar host \*(Ba Fl Fl admin-server= Ns Ar host
+.Op Fl s Ar port number \*(Ba Fl Fl server-port= Ns Ar port number
+.Op Fl l | Fl Fl local
+.Op Fl h | Fl Fl help
+.Op Fl v | Fl Fl version
.Op Ar command
.Ek
.Sh DESCRIPTION
@@ -65,21 +65,21 @@
.Pp
Supported options:
.Bl -tag -width Ds
-.It Fl p Ar string , Fl -principal= Ns Ar string
+.It Fl p Ar string , Fl Fl principal= Ns Ar string
principal to authenticate as
-.It Fl K Ar string , Fl -keytab= Ns Ar string
+.It Fl K Ar string , Fl Fl keytab= Ns Ar string
keytab for authentication principal
-.It Fl c Ar file , Fl -config-file= Ns Ar file
+.It Fl c Ar file , Fl Fl config-file= Ns Ar file
location of config file
-.It Fl k Ar file , Fl -key-file= Ns Ar file
+.It Fl k Ar file , Fl Fl key-file= Ns Ar file
location of master key file
-.It Fl r Ar realm , Fl -realm= Ns Ar realm
+.It Fl r Ar realm , Fl Fl realm= Ns Ar realm
realm to use
-.It Fl a Ar host , Fl -admin-server= Ns Ar host
+.It Fl a Ar host , Fl Fl admin-server= Ns Ar host
server to contact
-.It Fl s Ar port number , Fl -server-port= Ns Ar port number
+.It Fl s Ar port number , Fl Fl server-port= Ns Ar port number
port to use
-.It Fl l , Fl -local
+.It Fl l , Fl Fl local
local admin mode
.El
.Pp
@@ -103,15 +103,15 @@
.\" with nested Xo/Xc
.Pp
Home |
Main Index |
Thread Index |
Old Index