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 merge conflicts, adjust the build.



details:   https://anonhg.NetBSD.org/src/rev/8ec21f719238
branches:  trunk
changeset: 821208:8ec21f719238
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 28 21:31:43 2017 +0000

description:
merge conflicts, adjust the build.

diffstat:

 crypto/external/bsd/heimdal/Makefile.rules.inc                                                |     4 +-
 crypto/external/bsd/heimdal/bin/Makefile.inc                                                  |     4 +-
 crypto/external/bsd/heimdal/bin/kcc/Makefile                                                  |     7 +-
 crypto/external/bsd/heimdal/dist/NEWS                                                         |     2 +-
 crypto/external/bsd/heimdal/dist/admin/add.c                                                  |     4 +-
 crypto/external/bsd/heimdal/dist/admin/change.c                                               |     4 +-
 crypto/external/bsd/heimdal/dist/admin/copy.c                                                 |     4 +-
 crypto/external/bsd/heimdal/dist/admin/destroy.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/admin/get.c                                                  |     4 +-
 crypto/external/bsd/heimdal/dist/admin/ktutil.1                                               |     2 +-
 crypto/external/bsd/heimdal/dist/admin/ktutil.8                                               |   126 -
 crypto/external/bsd/heimdal/dist/admin/ktutil.c                                               |     4 +-
 crypto/external/bsd/heimdal/dist/admin/ktutil_locl.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/admin/list.c                                                 |     4 +-
 crypto/external/bsd/heimdal/dist/admin/purge.c                                                |     4 +-
 crypto/external/bsd/heimdal/dist/admin/remove.c                                               |     4 +-
 crypto/external/bsd/heimdal/dist/admin/rename.c                                               |     4 +-
 crypto/external/bsd/heimdal/dist/base/Makefile.am                                             |    31 -
 crypto/external/bsd/heimdal/dist/base/NTMakefile                                              |    53 -
 crypto/external/bsd/heimdal/dist/base/array.c                                                 |   236 -
 crypto/external/bsd/heimdal/dist/base/baselocl.h                                              |   141 -
 crypto/external/bsd/heimdal/dist/base/bool.c                                                  |    60 -
 crypto/external/bsd/heimdal/dist/base/dict.c                                                  |   284 -
 crypto/external/bsd/heimdal/dist/base/heimbase.c                                              |   561 -
 crypto/external/bsd/heimdal/dist/base/heimbase.h                                              |   190 -
 crypto/external/bsd/heimdal/dist/base/heimbasepriv.h                                          |    93 -
 crypto/external/bsd/heimdal/dist/base/heimqueue.h                                             |   169 -
 crypto/external/bsd/heimdal/dist/base/json.c                                                  |   149 -
 crypto/external/bsd/heimdal/dist/base/null.c                                                  |    54 -
 crypto/external/bsd/heimdal/dist/base/number.c                                                |   129 -
 crypto/external/bsd/heimdal/dist/base/roken_rename.h                                          |    60 -
 crypto/external/bsd/heimdal/dist/base/string.c                                                |   117 -
 crypto/external/bsd/heimdal/dist/base/test_base.c                                             |   154 -
 crypto/external/bsd/heimdal/dist/base/version-script.map                                      |    28 -
 crypto/external/bsd/heimdal/dist/cf/check-x.m4                                                |    53 -
 crypto/external/bsd/heimdal/dist/cf/check-xau.m4                                              |    64 -
 crypto/external/bsd/heimdal/dist/cf/roken-frag.m4                                             |     2 +
 crypto/external/bsd/heimdal/dist/cf/version-script.m4                                         |     2 +-
 crypto/external/bsd/heimdal/dist/configure.ac                                                 |     8 +-
 crypto/external/bsd/heimdal/dist/doc/ack.texi                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/doc/apps.texi                                                |     2 +-
 crypto/external/bsd/heimdal/dist/doc/copyright.texi                                           |     2 +-
 crypto/external/bsd/heimdal/dist/doc/heimdal.hhp                                              |     2 +-
 crypto/external/bsd/heimdal/dist/doc/heimdal.texi                                             |     2 +-
 crypto/external/bsd/heimdal/dist/doc/hx509.hhp                                                |     2 +-
 crypto/external/bsd/heimdal/dist/doc/hx509.texi                                               |     2 +-
 crypto/external/bsd/heimdal/dist/doc/install.texi                                             |     2 +-
 crypto/external/bsd/heimdal/dist/doc/intro.texi                                               |     2 +-
 crypto/external/bsd/heimdal/dist/doc/kerberos4.texi                                           |     2 +-
 crypto/external/bsd/heimdal/dist/doc/migration.texi                                           |     2 +-
 crypto/external/bsd/heimdal/dist/doc/misc.texi                                                |     2 +-
 crypto/external/bsd/heimdal/dist/doc/oid.txt                                                  |    32 -
 crypto/external/bsd/heimdal/dist/doc/programming.texi                                         |     2 +-
 crypto/external/bsd/heimdal/dist/doc/setup.texi                                               |     2 +-
 crypto/external/bsd/heimdal/dist/doc/whatis.texi                                              |     2 +-
 crypto/external/bsd/heimdal/dist/doc/win2k.texi                                               |     2 +-
 crypto/external/bsd/heimdal/dist/include/bits.c                                               |    20 +-
 crypto/external/bsd/heimdal/dist/include/crypto-headers.h                                     |    32 +-
 crypto/external/bsd/heimdal/dist/include/heim_threads.h                                       |     4 +-
 crypto/external/bsd/heimdal/dist/include/krb5-types.cross                                     |    10 +-
 crypto/external/bsd/heimdal/dist/kadmin/add-random-users.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/add_enctype.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/ank.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/check.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/cpw.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/del.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/del_enctype.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/dump.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/ext.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/get.c                                                 |    38 +-
 crypto/external/bsd/heimdal/dist/kadmin/init.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/kadm_conn.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/kadmin.1                                              |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/kadmin.8                                              |   349 -
 crypto/external/bsd/heimdal/dist/kadmin/kadmin.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/kadmin_locl.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/kadmind.8                                             |    11 +-
 crypto/external/bsd/heimdal/dist/kadmin/kadmind.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/load.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/mod.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/pw_quality.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/random_password.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/rename.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/rpc.c                                                 |     4 +-
 crypto/external/bsd/heimdal/dist/kadmin/server.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/stash.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/test_util.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/kadmin/util.c                                                |    79 +-
 crypto/external/bsd/heimdal/dist/kcm/acl.c                                                    |     2 +-
 crypto/external/bsd/heimdal/dist/kcm/acquire.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kcm/cache.c                                                  |     7 +-
 crypto/external/bsd/heimdal/dist/kcm/client.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kcm/config.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kcm/connect.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kcm/events.c                                                 |     4 +-
 crypto/external/bsd/heimdal/dist/kcm/glue.c                                                   |     4 +-
 crypto/external/bsd/heimdal/dist/kcm/headers.h                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kcm/kcm.8                                                    |     4 +-
 crypto/external/bsd/heimdal/dist/kcm/kcm_locl.h                                               |     2 +-
 crypto/external/bsd/heimdal/dist/kcm/log.c                                                    |     4 +-
 crypto/external/bsd/heimdal/dist/kcm/main.c                                                   |     4 +-
 crypto/external/bsd/heimdal/dist/kcm/protocol.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/kcm/renew.c                                                  |     4 +-
 crypto/external/bsd/heimdal/dist/kcm/sessions.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/announce.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/config.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/connect.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/default_config.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/digest-service.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/digest.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/fast.c                                                   |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/headers.h                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/hprop.8                                                  |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/hprop.c                                                  |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/hprop.h                                                  |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/hpropd.8                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/hpropd.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/kdc-replay.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/kdc-tester.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/kdc.8                                                    |    15 +-
 crypto/external/bsd/heimdal/dist/kdc/kdc.h                                                    |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/kdc_locl.h                                               |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/kerberos5.c                                              |  1736 ++-
 crypto/external/bsd/heimdal/dist/kdc/krb5tgs.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/kstash.8                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/kstash.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/kx509.c                                                  |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/log.c                                                    |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/main.c                                                   |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/misc.c                                                   |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/mit_dump.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/pkinit-ec.c                                              |     5 +-
 crypto/external/bsd/heimdal/dist/kdc/pkinit.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/process.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/rx.h                                                     |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/set_dbinfo.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/string2key.8                                             |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/string2key.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/windc.c                                                  |     2 +-
 crypto/external/bsd/heimdal/dist/kdc/windc_plugin.h                                           |     2 +-
 crypto/external/bsd/heimdal/dist/kpasswd/kpasswd-generator.c                                  |     4 +-
 crypto/external/bsd/heimdal/dist/kpasswd/kpasswd.1                                            |     2 +-
 crypto/external/bsd/heimdal/dist/kpasswd/kpasswd.c                                            |     4 +-
 crypto/external/bsd/heimdal/dist/kpasswd/kpasswd_locl.h                                       |     2 +-
 crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.8                                           |     2 +-
 crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.c                                           |   251 +-
 crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1                                      |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/generate-requests.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/heimtools.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kcc-commands.in                                        |   239 -
 crypto/external/bsd/heimdal/dist/kuser/kcc-version.rc                                         |    36 -
 crypto/external/bsd/heimdal/dist/kuser/kcc.c                                                  |   167 -
 crypto/external/bsd/heimdal/dist/kuser/kcpytkt.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kdecode_ticket.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kdeltkt.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kdestroy.1                                             |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kdestroy.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kdigest.8                                              |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kdigest.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kgetcred.1                                             |   102 +-
 crypto/external/bsd/heimdal/dist/kuser/kgetcred.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kimpersonate.8                                         |    32 +-
 crypto/external/bsd/heimdal/dist/kuser/kimpersonate.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kinit.1                                                |    14 +-
 crypto/external/bsd/heimdal/dist/kuser/kinit.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/klist.1                                                |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/klist.c                                                |   254 +-
 crypto/external/bsd/heimdal/dist/kuser/kswitch.1                                              |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kswitch.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kuser_locl.h                                           |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kverify.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/kuser/kvno.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/45/NTMakefile                                            |    35 -
 crypto/external/bsd/heimdal/dist/lib/asn1/asn1-common.h                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/asn1-template.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/asn1_gen.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/asn1_print.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/asn1_queue.h                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/asn1parse.y                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/check-ber.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/check-common.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/check-common.h                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/check-der.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/check-gen.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/check-template.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/check-timegm.c                                      |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/der.c                                               |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/der.h                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/der_cmp.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/der_copy.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/der_format.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/der_free.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/der_get.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/der_length.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/der_locl.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/der_put.c                                           |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/extra.c                                             |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/fuzzer.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/gen.c                                               |   109 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/gen_copy.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/gen_decode.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/gen_encode.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/gen_free.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/gen_glue.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/gen_length.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/gen_seq.c                                           |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/gen_template.c                                      |     8 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/hash.c                                              |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/hash.h                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/heim_asn1.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/lex.h                                               |     4 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/lex.l                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/main.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/roken_rename.h                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/symbol.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/symbol.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/template.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/asn1/timegm.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/array.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/baselocl.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/bool.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/bsearch.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/data.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/db.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/dict.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/dll.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/error.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/heimbase.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/heimbase.h                                          |    12 +-
 crypto/external/bsd/heimdal/dist/lib/base/heimbasepriv.h                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/heimqueue.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/json.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/null.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/number.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/roken_rename.h                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/string.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/base/test_base.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/com_err/com_err.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/com_err/com_err.h                                        |     6 +-
 crypto/external/bsd/heimdal/dist/lib/com_err/com_right.h                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c                                     |     9 +-
 crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/com_err/error.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/com_err/lex.h                                            |     4 +-
 crypto/external/bsd/heimdal/dist/lib/com_err/lex.l                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/com_err/parse.y                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/com_err/roken_rename.h                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/gss_acquire_cred.3                                |    52 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi.3                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi/gssapi.h                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi/gssapi_krb5.h                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi/gssapi_netlogon.h                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi/gssapi_ntlm.h                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi/gssapi_oid.h                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi/gssapi_spnego.h                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi_mech.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/gsstool.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/8003.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/accept_sec_context.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/acquire_cred.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/add_cred.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/address_to_krb5addr.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/aeap.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/arcfour.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/authorize_localname.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/canonicalize_name.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/ccache_name.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/cfx.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/cfx.h                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/compare_name.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/compat.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/context_time.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/copy_ccache.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/creds.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/decapsulate.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/delete_sec_context.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/display_name.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/display_status.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/duplicate_name.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/encapsulate.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/export_name.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/export_sec_context.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/external.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/get_mic.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/gsskrb5_locl.h                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/import_name.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/import_sec_context.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/indicate_mechs.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c                           |    85 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/inquire_context.c                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/inquire_cred.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/inquire_cred_by_mech.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/inquire_cred_by_oid.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/inquire_mechs_for_name.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/inquire_names_for_mech.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/inquire_sec_context_by_oid.c                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/pname_to_uid.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/prf.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/process_context_token.c                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/release_buffer.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/release_cred.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/release_name.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/sequence.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/set_cred_option.c                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/set_sec_context_option.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/store_cred.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/test_acquire_cred.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/test_cfx.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/test_cred.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/test_kcred.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/test_oid.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/ticket_flags.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/unwrap.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c                                 |    20 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/wrap.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/compat.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/context.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/context.h                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/cred.h                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/doxygen.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_accept_sec_context.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_acquire_cred.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_acquire_cred_ext.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_acquire_cred_with_password.c             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_add_cred.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_add_cred_with_password.c                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_add_oid_set_member.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_aeap.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_authorize_localname.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_buffer_set.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_canonicalize_name.c                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_compare_name.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_context_time.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_create_empty_oid_set.c                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_cred.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_decapsulate_token.c                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_delete_name_attribute.c                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_delete_sec_context.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_display_name.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_display_name_ext.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_display_status.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_duplicate_name.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_duplicate_oid.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_encapsulate_token.c                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_export_name.c                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_export_name_composite.c                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_export_sec_context.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_get_mic.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_get_name_attribute.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_import_name.c                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_import_sec_context.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_indicate_mechs.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_init_sec_context.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_inquire_context.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_inquire_cred.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_inquire_cred_by_mech.c                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_inquire_cred_by_oid.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_inquire_mechs_for_name.c                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_inquire_name.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_inquire_names_for_mech.c                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_inquire_sec_context_by_oid.c             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_krb5.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_mech_switch.c                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_mo.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_names.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_oid.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_oid_equal.c                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_oid_to_str.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_process_context_token.c                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pseudo_random.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_release_buffer.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_release_cred.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_release_name.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_release_oid.c                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_release_oid_set.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_seal.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_set_cred_option.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_set_name_attribute.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_set_sec_context_option.c                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_sign.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_store_cred.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_test_oid_set_member.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_unseal.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_unwrap.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_utils.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_verify.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_verify_mic.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_wrap.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_wrap_size_limit.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/mech.5                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/mech_locl.h                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/mech_switch.h                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/mechqueue.h                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/name.h                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/mech/utils.h                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c                     |     4 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c                           |     6 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c                               |     6 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c                      |     4 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c                           |     6 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/context_time.c                           |     4 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/crypto.c                                 |     8 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c                           |     4 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c                            |     4 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c                       |     6 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_context.c                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c                           |     6 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c                   |     6 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.c                 |     4 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/process_context_token.c                  |     4 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/accept_sec_context.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/acquire_cred.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/add_cred.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/canonicalize_name.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/compare_name.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/context_time.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.c                                      |     4 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/crypto.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/delete_sec_context.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/display_name.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/display_status.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/duplicate_name.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/export_name.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/export_sec_context.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/external.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/import_name.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/import_sec_context.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/indicate_mechs.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/init_sec_context.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/inquire_context.c                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/inquire_cred_by_mech.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/inquire_mechs_for_name.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/inquire_names_for_mech.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/inquire_sec_context_by_oid.c                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/iter_cred.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/kdc.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/ntlm.h                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/process_context_token.c                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/release_cred.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/release_name.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/spnego/accept_sec_context.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/spnego/compat.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/spnego/context_stubs.c                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/spnego/cred_stubs.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/spnego/external.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/spnego/init_sec_context.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/spnego/spnego_locl.h                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/test_acquire_cred.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/test_add_store_cred.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/test_common.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/test_common.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/test_context.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/test_cred.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/test_kcred.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/test_names.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/test_ntlm.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/gssapi/test_oid.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/aes.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/aes.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/bn.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/bn.h                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/camellia-ntt.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/camellia-ntt.h                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/camellia.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/camellia.h                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/common.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/common.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/des-tables.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/des.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/des.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/destest.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/dh-ltm.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/dh-tfm.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/dh.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/dh.h                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/dllmain.c                                        |    51 -
 crypto/external/bsd/heimdal/dist/lib/hcrypto/doxygen.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/dsa.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/dsa.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/ec.c                                             |     5 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/ec.h                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/ecdh.h                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/ecdsa.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c                                         |     7 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-cc.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-cc.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-crypt.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-hcrypto.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-hcrypto.h                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-openssl.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-openssl.h                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-pkcs11.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-pkcs11.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-w32.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-w32.h                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-wincng.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp-wincng.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/evp.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/example_evp_cipher.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/hash.h                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/hmac.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/hmac.h                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/NTMakefile                            |     1 +
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_error.c                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_fast_mp_invmod.c                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_fast_mp_montgomery_reduce.c        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_fast_s_mp_mul_digs.c               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_fast_s_mp_mul_high_digs.c          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_fast_s_mp_sqr.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_2expt.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_abs.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_add.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_add_d.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_addmod.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_and.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_clamp.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_clear.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_clear_multi.c                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_cmp.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_cmp_d.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_cmp_mag.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_cnt_lsb.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_copy.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_count_bits.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_div.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_div_2.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_div_2d.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_div_3.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_div_d.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_dr_is_modulus.c                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_dr_reduce.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_dr_setup.c                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_exch.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_expt_d.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_exptmod.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_exptmod_fast.c                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_exteuclid.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_find_prime.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_fread.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_fwrite.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_gcd.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_get_int.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_grow.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init_copy.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init_multi.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init_set.c                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init_set_int.c                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_init_size.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_invmod.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_invmod_slow.c                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_is_square.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_isprime.c                       |    77 -
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_jacobi.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_karatsuba_mul.c                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_karatsuba_sqr.c                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_lcm.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_lshd.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mod.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mod_2d.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mod_d.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_montgomery_calc_normalization.c |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_montgomery_reduce.c             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_montgomery_setup.c              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mul.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mul_2.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mul_2d.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mul_d.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_mulmod.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_n_root.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_neg.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_or.c                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_fermat.c                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_is_divisible.c            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_is_prime.c                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_miller_rabin.c            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_next_prime.c              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_rabin_miller_trials.c     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_prime_random_ex.c               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_radix_size.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_radix_smap.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_rand.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_read_radix.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_read_signed_bin.c               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_read_unsigned_bin.c             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_2k.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_2k_l.c                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup.c               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup_l.c             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_is_2k.c                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_is_2k_l.c                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_reduce_setup.c                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_rshd.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_set.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_set_int.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_shrink.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_signed_bin_size.c               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_sqr.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_sqrmod.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_sqrt.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_sub.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_sub_d.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_submod.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_to_signed_bin.c                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_to_signed_bin_n.c               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_to_unsigned_bin.c               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_to_unsigned_bin_n.c             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_toom_mul.c                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_toom_sqr.c                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_toradix.c                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_toradix_n.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_unsigned_bin_size.c             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_xor.c                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_zero.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_mp_zero_multi.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_prime_tab.c                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_reverse.c                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_add.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_exptmod.c                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_mul_digs.c                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_mul_high_digs.c               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_sqr.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bn_s_mp_sub.c                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/bncore.c                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/demo/demo.c                           |     8 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/etc/pprime.c                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/etc/timer.asm                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/gen.pl                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/logs/README                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/mtest/mpi.c                           |     4 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/mtest/mtest.c                         |     6 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/pics/makefile                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/pretty.build                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/tommath.h                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/tommath.src                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/tommath.tex                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/tommath_class.h                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/libtommath/tommath_superclass.h                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c                                            |    14 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/md4.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/md4.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/md5.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/md5.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/md5crypt_test.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/mdtest.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/passwd_dlg.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/passwd_dlg.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/pkcs12.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/pkcs12.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/pkcs5.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rand-egd.c                                       |   262 -
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rand-fortuna.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rand-timer.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rand-unix.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rand-w32.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rand.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rand.h                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/randi.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rc2.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rc2.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rc2test.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rc4.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rc4.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rctest.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/resource.h                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rijndael-alg-fst.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rijndael-alg-fst.h                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rnd_keys.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rsa-gmp.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rsa-ltm.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rsa-tfm.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rsa.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/rsa.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/sha.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/sha.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/sha256.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/sha512.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/test_bn.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/test_bulk.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/test_cipher.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/test_dh.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/test_engine_dso.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/test_hmac.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/test_pkcs12.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/test_pkcs5.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/test_rand.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/test_rsa.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/ui.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/ui.h                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/undef.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hcrypto/validate.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/common.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/db.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/db3.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/dbinfo.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/ext.c                                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/hdb-keytab.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/hdb-ldap.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/hdb-mdb.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/hdb-mitdb.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/hdb-sqlite.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/hdb.c                                                |   318 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/hdb.h                                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/hdb_locl.h                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/keys.c                                               |   507 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/keytab.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/mkey.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/ndbm.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/print.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/test_dbinfo.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/test_hdbkeys.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/test_hdbplugin.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hdb/test_mkey.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/heimdal/dllmain.c                                        |    42 -
 crypto/external/bsd/heimdal/dist/lib/hx509/ChangeLog                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/ca.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/cert.c                                             |   150 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/char_map.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/cms.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/collector.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/crypto-ec.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/crypto.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/data/secp160r1TestCA.cert.pem                      |    12 -
 crypto/external/bsd/heimdal/dist/lib/hx509/data/secp160r1TestCA.key.pem                       |     4 -
 crypto/external/bsd/heimdal/dist/lib/hx509/data/secp160r1TestCA.pem                           |    18 -
 crypto/external/bsd/heimdal/dist/lib/hx509/data/secp160r2TestClient.cert.pem                  |     9 -
 crypto/external/bsd/heimdal/dist/lib/hx509/data/secp160r2TestClient.key.pem                   |     4 -
 crypto/external/bsd/heimdal/dist/lib/hx509/data/secp160r2TestClient.pem                       |    15 -
 crypto/external/bsd/heimdal/dist/lib/hx509/data/secp160r2TestServer.cert.pem                  |     9 -
 crypto/external/bsd/heimdal/dist/lib/hx509/data/secp160r2TestServer.key.pem                   |     4 -
 crypto/external/bsd/heimdal/dist/lib/hx509/data/secp160r2TestServer.pem                       |    15 -
 crypto/external/bsd/heimdal/dist/lib/hx509/doxygen.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/env.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/error.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/file.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/hx509.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/hx_locl.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/hxtool.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/keyset.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/ks_dir.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/ks_file.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/ks_keychain.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/ks_mem.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/ks_null.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/ks_p11.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/ks_p12.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/lock.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/name.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/peer.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/print.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/ref/pkcs11.h                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/req.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/revoke.c                                           |   276 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/sel.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/sel.h                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/test_expr.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/test_name.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/hx509/test_soft_pkcs11.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/ipc/client.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/ipc/common.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/ipc/heim-ipc.h                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/ipc/heim_ipc_types.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/ipc/hi_locl.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/ipc/server.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/ipc/tc.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/ipc/ts-http.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/ipc/ts.c                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/acl.c                                              |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c                                               |    56 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/admin.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/bump_pw_expire.c                                   |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/chpass_c.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/chpass_s.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/client_glue.c                                      |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/common_glue.c                                      |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/context_s.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/create_c.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/create_s.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/default_keys.c                                     |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/delete_c.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/delete_s.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/destroy_c.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/destroy_s.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/ent_setup.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/error.c                                            |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/flush.c                                            |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/flush_c.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/flush_s.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/free.c                                             |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/get_c.c                                            |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/get_princs_c.c                                     |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/get_princs_s.c                                     |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/get_s.c                                            |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/init_c.c                                           |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/init_s.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8                                        |   131 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/iprop.8                                            |    18 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/iprop.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/ipropd_common.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/ipropd_master.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/ipropd_slave.c                                     |     6 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/kadm5-pwcheck.h                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/kadm5_locl.h                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/kadm5_pwcheck.3                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/keys.c                                             |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/log.c                                              |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/marshall.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/modify_c.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/modify_s.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/password_quality.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/private.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/privs_c.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/privs_s.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/randkey_c.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/randkey_s.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/rename_c.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/rename_s.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/sample_passwd_check.c                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/send_recv.c                                        |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/server_glue.c                                      |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/set_keys.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/set_modifier.c                                     |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/setkey3_s.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kadm5/test_pw_quality.c                                  |     4 +-
 crypto/external/bsd/heimdal/dist/lib/kafs/afskrb5.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kafs/afslib.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kafs/afssys.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kafs/afssysdefs.h                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kafs/common.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kafs/kafs.3                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kafs/kafs.h                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kafs/kafs_locl.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kafs/roken_rename.h                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kafs/rxkad_kdf.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/kdfs/k5dfspag.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/acache.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/acl.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/add_et_list.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/addr_families.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/aes-test.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/an2ln_plugin.h                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/aname_to_localname.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/appdefault.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/asn1_glue.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/auth_context.c                                      |    90 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/build_ap_req.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/build_auth.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/cache.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/ccache_plugin.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/changepw.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/codec.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/config_reg.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/constants.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/context.c                                           |   207 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/convert_creds.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/copy_host_realm.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crc.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/creds.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-aes-sha1.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-aes-sha2.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-aes.c                                        |   172 -
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-algs.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-arcfour.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des-common.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c                                       |    67 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-evp.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-null.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-pk.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-rand.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto-stubs.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/crypto.h                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/data.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/db_plugin.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/db_plugin.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/dcache.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/deprecated.c                                        |     6 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/derived-key-test.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/digest.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/dll.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/doxygen.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/eai_to_heim_errno.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/enomem.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/error_string.c                                      |    10 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/expand_hostname.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/expand_path.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/fast.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/fcache.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/free.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/free_host_realm.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/generate_seq_number.c                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/generate_subkey.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/get_addrs.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/get_cred.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/get_default_realm.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/get_for_creds.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/get_host_realm.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/get_in_tkt.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/get_port.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/init_creds.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/init_creds_pw.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/kcm.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/kcm.h                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/kerberos.8                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/keyblock.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/keytab.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/keytab_any.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/keytab_file.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/keytab_keyfile.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/keytab_memory.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5-plugin.7                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5-v4compat.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5                                         |   357 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5.h                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb524_convert_creds_kdc.3                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_425_conv_principal.3                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_acl_match_file.3                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_aname_to_localname.3                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_appdefault.3                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_auth_context.3                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_c_make_checksum.3                              |     4 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_ccapi.h                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_check_transited.3                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_create_checksum.3                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_creds.3                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_digest.3                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_eai_to_heim_errno.3                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_encrypt.3                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_find_padata.3                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_generate_random_block.3                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_get_all_client_addrs.3                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_get_credentials.3                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_get_creds.3                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_get_forwarded_creds.3                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_get_in_cred.3                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_get_init_creds.3                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_get_krbhst.3                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_getportbyname.3                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_init_context.3                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_is_thread_safe.3                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_krbhst_init.3                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_locl.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_mk_req.3                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_mk_safe.3                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_openlog.3                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_parse_name.3                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_principal.3                                    |     3 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_rcache.3                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_rd_error.3                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_rd_safe.3                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_set_default_realm.3                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_set_password.3                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_string_to_key.3                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_verify_init_creds.3                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krb5_verify_user.3                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krbhst-test.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/krbhst.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/kuserok_plugin.h                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/locate_plugin.h                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/log.c                                               |    12 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/mcache.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/misc.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/mit_glue.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/mk_error.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/mk_priv.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/mk_rep.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/mk_req.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/mk_req_ext.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/mk_safe.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/n-fold-test.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/n-fold.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/net_read.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/net_write.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/pac.c                                               |   104 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/padata.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/parse-name-test.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/pcache.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/pkinit-ec.c                                         |     5 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c                                            |     4 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/plugin.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/principal.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/prog_setup.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/prompter_posix.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/pseudo-random-test.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/rd_cred.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/rd_error.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/rd_priv.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/rd_rep.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/rd_req.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/rd_safe.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/read_message.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/recvauth.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/replay.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/salt-aes-sha1.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/salt-aes-sha2.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/salt-aes.c                                          |   105 -
 crypto/external/bsd/heimdal/dist/lib/krb5/salt-arcfour.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/salt-des.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/salt-des3.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/salt.c                                              |    22 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/scache.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c                                       |  1728 ++-
 crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc_plugin.h                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/sendauth.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/set_default_realm.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/sock_principal.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/sp800-108-kdf.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/store-int.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/store-int.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/store-test.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/store.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/store_emem.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/store_fd.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/store_mem.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/store_sock.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/string-to-key-test.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_acl.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_addr.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_alname.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_ap-req.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_canon.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_cc.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_config.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_crypto.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_crypto_wrapping.c                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_expand_toks.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_forward.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_fx.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_get_addrs.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_gic.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_hostname.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_keytab.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_kuserok.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_mem.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_pac.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_pkinit_dh2key.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c                                    |    10 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_plugin.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_prf.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_princ.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_renew.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_rfc3961.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_set_kvno0.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_store.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_time.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/test_x500.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/time.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/transited.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/verify_init.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/verify_krb5_conf.8                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/verify_krb5_conf.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/verify_user.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map                                  |    66 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/version.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/warn.c                                              |    28 +-
 crypto/external/bsd/heimdal/dist/lib/krb5/write_message.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/ntlm/test_ntlm.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/otp/otp.c                                                |     4 +-
 crypto/external/bsd/heimdal/dist/lib/otp/otp.h                                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/otp/otp_challenge.c                                      |     4 +-
 crypto/external/bsd/heimdal/dist/lib/otp/otp_db.c                                             |     4 +-
 crypto/external/bsd/heimdal/dist/lib/otp/otp_locl.h                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/otp/otp_md.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/otp/otp_md.h                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/otp/otp_parse.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/otp/otp_print.c                                          |     4 +-
 crypto/external/bsd/heimdal/dist/lib/otp/otp_verify.c                                         |     4 +-
 crypto/external/bsd/heimdal/dist/lib/otp/otptest.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/otp/roken_rename.h                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/ChangeLog                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/base64-test.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/base64.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/base64.h                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/bswap.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/chown.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/cloexec.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/closefrom.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/concat.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/copyhostent.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/ct.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/daemon.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/detach.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/dirent-test.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/dirent.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/dlfcn_w32.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/doxygen.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/dumpdata.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/ecalloc.3                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/ecalloc.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/emalloc.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/environment.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/eread.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/erealloc.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/err.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/err.hin                                            |    16 +-
 crypto/external/bsd/heimdal/dist/lib/roken/errx.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/esetenv.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/estrdup.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/ewrite.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/fchown.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/flock.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/fnmatch.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/freeaddrinfo.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/freehostent.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/gai_strerror.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/get_default_username.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/get_window_size.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getaddrinfo-test.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getaddrinfo.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getaddrinfo_hostspec.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getarg.3                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getarg.c                                           |     4 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getarg.h                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getcap.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getcwd.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getdtablesize.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getegid.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/geteuid.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getgid.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/gethostname.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getifaddrs-test.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getifaddrs.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getifaddrs_w32.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getipnodebyaddr.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getipnodebyname.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getnameinfo.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getnameinfo_verified.c                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getopt.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getprogname.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/gettimeofday.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getuid.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getusershell.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/glob.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/h_errno.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/hex-test.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/hex.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/hex.h                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/hostent_find_fqdn.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/hstrerror.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/inet_aton.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/inet_ntop.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/inet_pton.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/initgroups.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/innetgr.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/iruserok.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/issuid.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/k_getpwnam.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/k_getpwuid.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/localtime_r.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/lstat.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/memmove.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/memset_s.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/mini_inetd.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/mkdir.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/mkstemp.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/ndbm_wrap.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/ndbm_wrap.h                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/net_read.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/net_write.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/parse_bytes-test.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/parse_bytes.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/parse_bytes.h                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/parse_reply-test.c                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/parse_time-test.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/parse_time.3                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/parse_time.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/parse_time.h                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/parse_units.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/parse_units.h                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/putenv.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/qsort.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/rand.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/rcmd.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/readv.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/realloc.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/recvmsg.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/rename.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/resolve-test.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/resolve.c                                          |    59 +-
 crypto/external/bsd/heimdal/dist/lib/roken/resolve.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/rkpty.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/roken-common.h                                     |     6 +-
 crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in                                         |   204 +-
 crypto/external/bsd/heimdal/dist/lib/roken/roken_gethostby.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/rtbl.3                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/rtbl.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/rtbl.h                                             |     6 +-
 crypto/external/bsd/heimdal/dist/lib/roken/sendmsg.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/setegid.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/setenv.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/seteuid.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/setprogname.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/signal.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/simple_exec.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/simple_exec_w32.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/sleep.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/snprintf-test.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/snprintf.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/socket.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/socket_wrapper.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/socket_wrapper.h                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/sockstartup_w32.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strcasecmp.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strcollect.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strdup.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strerror.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strerror_r.c                                       |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strftime.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strlcat.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strlcpy.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strlwr.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strncasecmp.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strndup.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strnlen.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strpftime-test.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strpftime-test.h                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strpool.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strptime.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strsep.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strsep_copy.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strtok_r.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strtoll.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strtoull.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/strupr.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/swab.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/syslogc.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/test-detach.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/test-mem.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/test-mem.h                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/test-mini_inetd.c                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/test-readenv.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/timegm.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/timeval.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/tm2time.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/tsearch-test.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/tsearch.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/unsetenv.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/unvis.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/verify.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/verr.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/verrx.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/vis.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/vsyslog.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/vwarn.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/vwarnx.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/warn.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/warnerr.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/warnx.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/win32_alloc.c                                      |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/write_pid.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/writev.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/xdbm.h                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/roken/xfree.c                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/sl/roken_rename.h                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/sl/sl.c                                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/sl/sl.h                                                  |     2 +-
 crypto/external/bsd/heimdal/dist/lib/sl/sl_locl.h                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/sl/slc-gram.y                                            |     2 +-
 crypto/external/bsd/heimdal/dist/lib/sl/slc-lex.l                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/sl/slc.h                                                 |     2 +-
 crypto/external/bsd/heimdal/dist/lib/sl/test_sl.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/lib/vers/make-print-version.c                                |     2 +-
 crypto/external/bsd/heimdal/dist/lib/vers/print_version.c                                     |     7 +-
 crypto/external/bsd/heimdal/dist/lib/vers/vers.h                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/bidi.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/combining.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/doxygen.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/errorlist.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/idn-lookup.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/ldap.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/map.c                                               |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/normalize.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/punycode.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/stringprep.c                                        |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/test-bidi.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/test-ldap.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/test-map.c                                          |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/test-normalize.c                                    |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/test-prohibited.c                                   |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/test-punycode.c                                     |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/test-rw.c                                           |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/test-utf8.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/utf8.c                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/wind.h                                              |     2 +-
 crypto/external/bsd/heimdal/dist/lib/wind/windlocl.h                                          |     2 +-
 crypto/external/bsd/heimdal/dist/packages/mac/Resources/English.lproj/Welcome.rtf             |     2 +-
 crypto/external/bsd/heimdal/dist/packages/windows/NTMakefile                                  |     2 +-
 crypto/external/bsd/heimdal/dist/packages/windows/assembly/policy.Heimdal.Kerberos.in         |     2 +-
 crypto/external/bsd/heimdal/dist/packages/windows/installer/heimdal-assemblies.wxs            |     2 +-
 crypto/external/bsd/heimdal/dist/tests/bin/intr.c                                             |     2 +-
 crypto/external/bsd/heimdal/dist/tests/db/text-dump-0.7                                       |     2 +-
 crypto/external/bsd/heimdal/dist/tests/kdc/wait-kdc.sh                                        |     2 +-
 crypto/external/bsd/heimdal/dist/tests/plugin/windc.c                                         |     2 +-
 crypto/external/bsd/heimdal/dist/tools/krb5-config.1                                          |     2 +-
 crypto/external/bsd/heimdal/dist/windows/README                                               |   147 -
 crypto/external/bsd/heimdal/dist/windows/maint.el                                             |    34 -
 crypto/external/bsd/heimdal/heimdal2netbsd                                                    |     4 +-
 crypto/external/bsd/heimdal/include/config.h                                                  |   206 +-
 crypto/external/bsd/heimdal/include/der-private.h                                             |    41 +
 crypto/external/bsd/heimdal/include/der-protos.h                                              |    72 +-
 crypto/external/bsd/heimdal/include/gsskrb5-private.h                                         |   111 +-
 crypto/external/bsd/heimdal/include/hdb-private.h                                             |    22 +-
 crypto/external/bsd/heimdal/include/hdb-protos.h                                              |   172 +-
 crypto/external/bsd/heimdal/include/heimntlm-protos.h                                         |   267 +-
 crypto/external/bsd/heimdal/include/hx509-private.h                                           |    20 +-
 crypto/external/bsd/heimdal/include/hx509-protos.h                                            |  1927 +++-
 crypto/external/bsd/heimdal/include/kadm5-private.h                                           |   103 +-
 crypto/external/bsd/heimdal/include/kadm5-protos.h                                            |   151 +
 crypto/external/bsd/heimdal/include/kcm-protos.h                                              |     2 +
 crypto/external/bsd/heimdal/include/kdc-private.h                                             |    73 +-
 crypto/external/bsd/heimdal/include/kdc-protos.h                                              |     2 +
 crypto/external/bsd/heimdal/include/krb5-private.h                                            |   250 +-
 crypto/external/bsd/heimdal/include/krb5-protos.h                                             |  4812 +++++++++-
 crypto/external/bsd/heimdal/include/krb5-types.h                                              |    41 +-
 crypto/external/bsd/heimdal/include/ntlm-private.h                                            |    56 +-
 crypto/external/bsd/heimdal/include/roken.h                                                   |    47 +-
 crypto/external/bsd/heimdal/include/spnego-private.h                                          |    48 +-
 crypto/external/bsd/heimdal/include/version.h                                                 |     4 +-
 crypto/external/bsd/heimdal/lib/libasn1/Makefile                                              |     4 +-
 crypto/external/bsd/heimdal/lib/libasn1/shlib_version                                         |     4 +-
 crypto/external/bsd/heimdal/lib/libcom_err/shlib_version                                      |     4 +-
 crypto/external/bsd/heimdal/lib/libgssapi/shlib_version                                       |     4 +-
 crypto/external/bsd/heimdal/lib/libhdb/Makefile                                               |    11 +-
 crypto/external/bsd/heimdal/lib/libhdb/shlib_version                                          |     4 +-
 crypto/external/bsd/heimdal/lib/libheimbase/Makefile                                          |     9 +-
 crypto/external/bsd/heimdal/lib/libheimbase/shlib_version                                     |     4 +-
 crypto/external/bsd/heimdal/lib/libheimntlm/shlib_version                                     |     4 +-
 crypto/external/bsd/heimdal/lib/libhx509/Makefile                                             |     3 +-
 crypto/external/bsd/heimdal/lib/libhx509/shlib_version                                        |     4 +-
 crypto/external/bsd/heimdal/lib/libkadm5clnt/shlib_version                                    |     4 +-
 crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile                                          |     4 +-
 crypto/external/bsd/heimdal/lib/libkadm5srv/shlib_version                                     |     4 +-
 crypto/external/bsd/heimdal/lib/libkafs/Makefile                                              |     4 +-
 crypto/external/bsd/heimdal/lib/libkafs/shlib_version                                         |     4 +-
 crypto/external/bsd/heimdal/lib/libkdc/Makefile                                               |     4 +-
 crypto/external/bsd/heimdal/lib/libkdc/shlib_version                                          |     4 +-
 crypto/external/bsd/heimdal/lib/libkrb5/Makefile                                              |    21 +-
 crypto/external/bsd/heimdal/lib/libkrb5/shlib_version                                         |     4 +-
 crypto/external/bsd/heimdal/lib/libroken/Makefile                                             |     5 +-
 crypto/external/bsd/heimdal/lib/libroken/shlib_version                                        |     4 +-
 crypto/external/bsd/heimdal/lib/libsl/shlib_version                                           |     4 +-
 crypto/external/bsd/heimdal/lib/libwind/shlib_version                                         |     4 +-
 crypto/external/bsd/heimdal/libexec/Makefile.inc                                              |     4 +-
 crypto/external/bsd/heimdal/sbin/Makefile.inc                                                 |     4 +-
 crypto/external/bsd/heimdal/sbin/kadmin/Makefile                                              |     7 +-
 crypto/external/bsd/heimdal/sbin/ktutil/Makefile                                              |     7 +-
 1368 files changed, 14474 insertions(+), 8806 deletions(-)

diffs (truncated from 42804 to 300 lines):

diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/Makefile.rules.inc
--- a/crypto/external/bsd/heimdal/Makefile.rules.inc    Sat Jan 28 20:46:41 2017 +0000
+++ b/crypto/external/bsd/heimdal/Makefile.rules.inc    Sat Jan 28 21:31:43 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rules.inc,v 1.7 2012/09/05 19:31:04 christos Exp $
+# $NetBSD: Makefile.rules.inc,v 1.8 2017/01/28 21:31:43 christos Exp $
 
 SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
 
@@ -72,7 +72,7 @@
 
 .for x2c in ${ASN1_FILES.${src}}
 ${x2c:.x=.c}: ${x2c}
-       @${TOOL_SED} ${NORMALIZE_SRC} < ${x2c} > ${x2c}.r
+       @${TOOL_SED} ${NORMALIZE_SRC} < ${.ALLSRC} > ${x2c}.r
        @cmp -s ${x2c}.r ${x2c:.x=.c} 2> /dev/null || cp ${x2c}.r ${x2c:.x=.c}
        @rm -f ${x2c}.r
 .endfor
diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/bin/Makefile.inc
--- a/crypto/external/bsd/heimdal/bin/Makefile.inc      Sat Jan 28 20:46:41 2017 +0000
+++ b/crypto/external/bsd/heimdal/bin/Makefile.inc      Sat Jan 28 21:31:43 2017 +0000
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/05/25 19:21:16 he Exp $
+# $NetBSD: Makefile.inc,v 1.3 2017/01/28 21:31:43 christos Exp $
 
 BINDIR=/usr/bin
 
 LDADD+= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lwind
 LDADD+= -lheimbase ${LIBVERS}
 LDADD+= -lcrypto -lcrypt
+LDADD+= -lsqlite3
 
 DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBWIND}
 DPADD+= ${LIBHEIMBASE} ${LIBVERS}
 DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
+DPADD+= ${LIBSQLITE3}
diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/bin/kcc/Makefile
--- a/crypto/external/bsd/heimdal/bin/kcc/Makefile      Sat Jan 28 20:46:41 2017 +0000
+++ b/crypto/external/bsd/heimdal/bin/kcc/Makefile      Sat Jan 28 21:31:43 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
+# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:43 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -12,14 +12,15 @@
 
 MAN= klist.1
 
-HEIMSRCS= kcc-commands.in
+HEIMSRCS= heimtools-commands.in
 
 SRCS=  copy_cred_cache.c       \
-       kcc.c                   \
+       heimtools.c             \
        klist.c                 \
        kswitch.c
 
 CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
+CPPFLAGS+= -I${HEIMDIST}/kuser
 
 LDADD+= -lkafs -lsl
 LDADD+= -ledit -lterminfo
diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/dist/NEWS
--- a/crypto/external/bsd/heimdal/dist/NEWS     Sat Jan 28 20:46:41 2017 +0000
+++ b/crypto/external/bsd/heimdal/dist/NEWS     Sat Jan 28 21:31:43 2017 +0000
@@ -233,7 +233,7 @@
 
  - Support for settin friendly name on credential caches
  - Move to using doxygen to generate documentation.
- - Sprinkling __attribute__((depricated)) for old function to be removed
+ - Sprinkling __attribute__((__deprecated__)) for old function to be removed
  - Support to export LAST-REQUST information in AS-REQ
  - Support for client deferrals in in AS-REQ
  - Add seek support for krb5_storage.
diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/dist/admin/add.c
--- a/crypto/external/bsd/heimdal/dist/admin/add.c      Sat Jan 28 20:46:41 2017 +0000
+++ b/crypto/external/bsd/heimdal/dist/admin/add.c      Sat Jan 28 21:31:43 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: add.c,v 1.1.1.3 2017/01/28 20:46:41 christos Exp $     */
+/*     $NetBSD: add.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
 
 /*
  * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
@@ -35,7 +35,7 @@
 
 #include "ktutil_locl.h"
 
-__RCSID("$NetBSD: add.c,v 1.1.1.3 2017/01/28 20:46:41 christos Exp $");
+__RCSID("$NetBSD: add.c,v 1.2 2017/01/28 21:31:44 christos Exp $");
 
 static char *
 readstring(const char *prompt, char *buf, size_t len)
diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/dist/admin/change.c
--- a/crypto/external/bsd/heimdal/dist/admin/change.c   Sat Jan 28 20:46:41 2017 +0000
+++ b/crypto/external/bsd/heimdal/dist/admin/change.c   Sat Jan 28 21:31:43 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: change.c,v 1.1.1.3 2017/01/28 20:46:41 christos Exp $  */
+/*     $NetBSD: change.c,v 1.2 2017/01/28 21:31:44 christos Exp $      */
 
 /*
  * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
@@ -35,7 +35,7 @@
 
 #include "ktutil_locl.h"
 
-__RCSID("$NetBSD: change.c,v 1.1.1.3 2017/01/28 20:46:41 christos Exp $");
+__RCSID("$NetBSD: change.c,v 1.2 2017/01/28 21:31:44 christos Exp $");
 
 static krb5_error_code
 change_entry (krb5_keytab keytab,
diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/dist/admin/copy.c
--- a/crypto/external/bsd/heimdal/dist/admin/copy.c     Sat Jan 28 20:46:41 2017 +0000
+++ b/crypto/external/bsd/heimdal/dist/admin/copy.c     Sat Jan 28 21:31:43 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: copy.c,v 1.1.1.3 2017/01/28 20:46:41 christos Exp $    */
+/*     $NetBSD: copy.c,v 1.2 2017/01/28 21:31:44 christos Exp $        */
 
 /*
  * Copyright (c) 1997-2004 Kungliga Tekniska Högskolan
@@ -35,7 +35,7 @@
 
 #include "ktutil_locl.h"
 
-__RCSID("$NetBSD: copy.c,v 1.1.1.3 2017/01/28 20:46:41 christos Exp $");
+__RCSID("$NetBSD: copy.c,v 1.2 2017/01/28 21:31:44 christos Exp $");
 
 
 static krb5_boolean
diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/dist/admin/destroy.c
--- a/crypto/external/bsd/heimdal/dist/admin/destroy.c  Sat Jan 28 20:46:41 2017 +0000
+++ b/crypto/external/bsd/heimdal/dist/admin/destroy.c  Sat Jan 28 21:31:43 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: destroy.c,v 1.1.1.1 2011/04/13 18:14:32 elric Exp $    */
+/*     $NetBSD: destroy.c,v 1.2 2017/01/28 21:31:44 christos Exp $     */
 
 /*
  * Copyright (c) 2009 Kungliga Tekniska Högskolan
diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/dist/admin/get.c
--- a/crypto/external/bsd/heimdal/dist/admin/get.c      Sat Jan 28 20:46:41 2017 +0000
+++ b/crypto/external/bsd/heimdal/dist/admin/get.c      Sat Jan 28 21:31:43 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: get.c,v 1.1.1.3 2017/01/28 20:46:41 christos Exp $     */
+/*     $NetBSD: get.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
 
 /*
  * Copyright (c) 1997-2004 Kungliga Tekniska Högskolan
@@ -35,7 +35,7 @@
 
 #include "ktutil_locl.h"
 
-__RCSID("$NetBSD: get.c,v 1.1.1.3 2017/01/28 20:46:41 christos Exp $");
+__RCSID("$NetBSD: get.c,v 1.2 2017/01/28 21:31:44 christos Exp $");
 
 static void*
 open_kadmin_connection(char *principal,
diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/dist/admin/ktutil.1
--- a/crypto/external/bsd/heimdal/dist/admin/ktutil.1   Sat Jan 28 20:46:41 2017 +0000
+++ b/crypto/external/bsd/heimdal/dist/admin/ktutil.1   Sat Jan 28 21:31:43 2017 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ktutil.1,v 1.1.1.1 2017/01/28 20:46:41 christos Exp $
+.\"    $NetBSD: ktutil.1,v 1.2 2017/01/28 21:31:44 christos Exp $
 .\"
 .\" Copyright (c) 1997-2004 Kungliga Tekniska Högskolan
 .\" (Royal Institute of Technology, Stockholm, Sweden).
diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/dist/admin/ktutil.8
--- a/crypto/external/bsd/heimdal/dist/admin/ktutil.8   Sat Jan 28 20:46:41 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-.\"    $NetBSD: ktutil.8,v 1.4 2014/04/25 00:26:16 pettai Exp $
-.\"
-.\" Copyright (c) 1997-2004 Kungliga Tekniska Högskolan
-.\" (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:
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" Id
-.\"
-.Dd April 14, 2005
-.Dt KTUTIL 8
-.Os
-.Sh NAME
-.Nm ktutil
-.Nd manage Kerberos keytabs
-.Sh SYNOPSIS
-.Nm
-.Oo Fl k Ar keytab \*(Ba Xo
-.Fl Fl keytab= Ns Ar keytab
-.Xc
-.Oc
-.Op Fl v | Fl Fl verbose
-.Op Fl Fl version
-.Op Fl h | Fl Fl help
-.Ar command
-.Op Ar args
-.Sh DESCRIPTION
-.Nm
-is a program for managing keytabs.
-Supported options:
-.Bl -tag -width Ds
-.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 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 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.
-.Pp
-If no principals are given, all the ones in the keytab are updated.
-.It copy Ar keytab-src Ar keytab-dest
-Copies all the entries from
-.Ar keytab-src
-to
-.Ar keytab-dest .
-.It get Oo Fl p Ar admin principal Oc \
-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),
-and put that key in the keytab.
-.Pp
-If no
-.Ar realm
-is specified, the realm to operate on is taken from the first
-principal.
-.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 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
-.Ar enctype
-removes keys of any type.
-.It rename Ar from-principal Ar to-principal
-Renames all entries in the keytab that match the
-.Ar from-principal
-to
-.Ar to-principal .
-.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
-(default one week) old.
-.El
-.Sh SEE ALSO
-.Xr kadmin 8
diff -r 1f957ce83654 -r 8ec21f719238 crypto/external/bsd/heimdal/dist/admin/ktutil.c
--- a/crypto/external/bsd/heimdal/dist/admin/ktutil.c   Sat Jan 28 20:46:41 2017 +0000
+++ b/crypto/external/bsd/heimdal/dist/admin/ktutil.c   Sat Jan 28 21:31:43 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ktutil.c,v 1.1.1.3 2017/01/28 20:46:41 christos Exp $  */



Home | Main Index | Thread Index | Old Index