Hello community,
here is the log from the commit of package python-kerberos for openSUSE:Factory
checked in at 2019-05-16 22:09:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-kerberos (Old)
and /work/SRC/openSUSE:Factory/.python-kerberos.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kerberos"
Thu May 16 22:09:21 2019 rev:4 rq:703249 version:1.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-kerberos/python-kerberos.changes
2018-02-09 15:53:19.018955425 +0100
+++
/work/SRC/openSUSE:Factory/.python-kerberos.new.5148/python-kerberos.changes
2019-05-16 22:09:24.386317190 +0200
@@ -1,0 +2,7 @@
+Wed May 15 17:40:46 UTC 2019 - [email protected]
+
+- Update to 1.3.0
+ * no changelog available
+ * added the license file
+
+-------------------------------------------------------------------
Old:
----
kerberos-1.2.5.tar.gz
New:
----
LICENSE.txt
kerberos-1.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-kerberos.spec ++++++
--- /var/tmp/diff_new_pack.WnifOz/_old 2019-05-16 22:09:25.698315998 +0200
+++ /var/tmp/diff_new_pack.WnifOz/_new 2019-05-16 22:09:25.706315990 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-kerberos
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without test
Name: python-kerberos
-Version: 1.2.5
+Version: 1.3.0
Release: 0
Summary: Kerberos high-level interface
License: Apache-2.0
Group: Development/Languages/Python
-Url: http://www.calendarserver.org/
+Url: https://github.com/apple/ccs-pykerberos
Source:
https://files.pythonhosted.org/packages/source/k/kerberos/kerberos-%{version}.tar.gz
+Source1:
https://raw.githubusercontent.com/apple/ccs-pykerberos/master/LICENSE.txt
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -42,6 +43,7 @@
%prep
%setup -q -n kerberos-%{version}
+cp %{SOURCE1} .
%build
export CFLAGS="%{optflags}"
@@ -55,5 +57,6 @@
%defattr(-,root,root,-)
%doc README.rst
%{python_sitearch}/*
+%license LICENSE.txt
%changelog
++++++ LICENSE.txt ++++++
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
++++++ kerberos-1.2.5.tar.gz -> kerberos-1.3.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/PKG-INFO new/kerberos-1.3.0/PKG-INFO
--- old/kerberos-1.2.5/PKG-INFO 2016-07-18 21:18:19.000000000 +0200
+++ new/kerberos-1.3.0/PKG-INFO 2018-03-08 22:07:34.000000000 +0100
@@ -1,14 +1,18 @@
Metadata-Version: 1.1
Name: kerberos
-Version: 1.2.5
+Version: 1.3.0
Summary: Kerberos high-level interface
-Home-page: http://www.calendarserver.org/
+Home-page: https://github.com/apple/ccs-pykerberos
Author: Apple Inc.
Author-email: [email protected]
License: Apache License, Version 2.0
+Description-Content-Type: UNKNOWN
Description: PyKerberos Package
==================
+ .. image:: https://travis-ci.org/apple/ccs-pykerberos.svg?branch=master
+ :target: https://travis-ci.org/apple/ccs-pykerberos
+
This Python package is a high-level wrapper for Kerberos (GSSAPI)
operations. The goal is to avoid having to build a module that wraps
the entire Kerberos.framework, and instead offer a limited set of
@@ -29,27 +33,30 @@
Testing
=======
- You must have a valid Kerberos setup on the test machine and you
- should ensure that you have valid Kerberos tickets for any client
- authentication being done (run 'klist' on the command line).
- Additionally, for the server: it must have been configured as a valid
- Kerberos service with the Kerbersos server for its realm - this
- usually requires running kadmin on the server machine to add the
- principal and generate a keytab entry for it (run 'sudo klist -k' to
- see the currently available keytab entries).
-
- Make sure that PYTHONPATH includes the appropriate build/lib.xxxx
- directory. Then run test.py with suitable command line arguments:
-
- python test.py -u userid -p password -s service
-
- -u
- user id for basic authenticate
- -p
- password for basic authenticate
- -s
- service principal for GSSAPI authentication (defaults to
- '[email protected]')
+ To run the tests in the tests folder, you must have a valid Kerberos
setup on
+ the test machine. You can use the script .travis.sh as quick and easy
way to
+ setup a Kerberos KDC and Apache web endpoint that can be used for the
tests.
+ Otherwise you can also run the following to run a self contained Docker
+ container
+
+ .. code-block: bash
+
+ docker run \
+ -v $(pwd):/app \
+ -w /app \
+ -e PYENV=2.7.13 \
+ -e KERBEROS_USERNAME=administrator \
+ -e KERBEROS_PASSWORD=Password01 \
+ -e KERBEROS_REALM=example.com \
+ -e KERBEROS_PORT=80 \
+ ubuntu:16.04 \
+ /bin/bash .travis.sh
+
+ The docker command needs to be run in the same directory as this
library and
+ you can test it with different Python versions by changing the value
of the
+ PYENV environment value set in the command.
+
+ Please have a look at testing_notes.md for more information.
IMPORTANT
@@ -60,6 +67,59 @@
production code.
+ Channel Bindings
+ ================
+
+ You can use this library to authenticate with Channel Binding support.
Channel
+ Bindings are tags that identify the particular data channel being used
with the
+ authentication. You can use Channel bindings to offer more proof of a
valid
+ identity. Some services like Microsoft's Extended Protection can
enforce
+ Channel Binding support on authorisation and you can use this library
to meet
+ those requirements.
+
+ More details on Channel Bindings as set through the GSSAPI can be
found here
+
<https://docs.oracle.com/cd/E19455-01/806-3814/overview-52/index.html>. Using
+ TLS as a example this is how you would add Channel Binding support to
your
+ authentication mechanism. The following code snippet is based on
RFC5929
+ <https://tools.ietf.org/html/rfc5929> using the
'tls-server-endpoint-point'
+ type.
+
+ .. code-block:: python
+
+ import hashlib
+
+ def get_channel_bindings_application_data(socket):
+ # This is a highly simplified example, there are other use
cases
+ # where you might need to use different hash types or get a
socket
+ # object somehow.
+ server_certificate = socket.getpeercert(True)
+ certificate_hash =
hashlib.sha256(server_certificate).hexdigest().upper()
+ certificate_digest = base64.b16decode(certificate_hash)
+ application_data = b'tls-server-end-point:%s' %
certificate_digest
+
+ return application_data
+
+ def main():
+ # Code to setup a socket with the server
+ # A lot of code to setup the handshake and start the auth
process
+ socket = getsocketsomehow()
+
+ # Connect to the host and start the auth process
+
+ # Build the channel bindings object
+ application_data =
get_channel_bindings_application_data(socket)
+ channel_bindings =
kerberos.channelBindings(application_data=application_data)
+
+ # More work to get responses from the server
+
+ result, context = kerberos.authGSSClientInit(kerb_spn,
gssflags=gssflags, principal=principal)
+
+ # Pass through the channel_bindings object as created in the
kerberos.channelBindings method
+ result = kerberos.authGSSClientStep(context, neg_resp_value,
channel_bindings=channel_bindings)
+
+ # Repeat as necessary
+
+
Python APIs
===========
@@ -69,7 +129,7 @@
Copyright and License
=====================
- Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2018 Apple Inc. All rights reserved.
This software is licensed under the Apache License, Version 2.0. The
Apache License is a well-established open source license, enabling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/README.rst
new/kerberos-1.3.0/README.rst
--- old/kerberos-1.2.5/README.rst 2016-01-25 18:51:33.000000000 +0100
+++ new/kerberos-1.3.0/README.rst 2018-03-08 21:00:27.000000000 +0100
@@ -1,6 +1,9 @@
PyKerberos Package
==================
+.. image:: https://travis-ci.org/apple/ccs-pykerberos.svg?branch=master
+ :target: https://travis-ci.org/apple/ccs-pykerberos
+
This Python package is a high-level wrapper for Kerberos (GSSAPI)
operations. The goal is to avoid having to build a module that wraps
the entire Kerberos.framework, and instead offer a limited set of
@@ -21,27 +24,30 @@
Testing
=======
-You must have a valid Kerberos setup on the test machine and you
-should ensure that you have valid Kerberos tickets for any client
-authentication being done (run 'klist' on the command line).
-Additionally, for the server: it must have been configured as a valid
-Kerberos service with the Kerbersos server for its realm - this
-usually requires running kadmin on the server machine to add the
-principal and generate a keytab entry for it (run 'sudo klist -k' to
-see the currently available keytab entries).
-
-Make sure that PYTHONPATH includes the appropriate build/lib.xxxx
-directory. Then run test.py with suitable command line arguments:
-
- python test.py -u userid -p password -s service
-
- -u
- user id for basic authenticate
- -p
- password for basic authenticate
- -s
- service principal for GSSAPI authentication (defaults to
- '[email protected]')
+To run the tests in the tests folder, you must have a valid Kerberos setup on
+the test machine. You can use the script .travis.sh as quick and easy way to
+setup a Kerberos KDC and Apache web endpoint that can be used for the tests.
+Otherwise you can also run the following to run a self contained Docker
+container
+
+.. code-block: bash
+
+ docker run \
+ -v $(pwd):/app \
+ -w /app \
+ -e PYENV=2.7.13 \
+ -e KERBEROS_USERNAME=administrator \
+ -e KERBEROS_PASSWORD=Password01 \
+ -e KERBEROS_REALM=example.com \
+ -e KERBEROS_PORT=80 \
+ ubuntu:16.04 \
+ /bin/bash .travis.sh
+
+The docker command needs to be run in the same directory as this library and
+you can test it with different Python versions by changing the value of the
+PYENV environment value set in the command.
+
+Please have a look at testing_notes.md for more information.
IMPORTANT
@@ -52,6 +58,59 @@
production code.
+Channel Bindings
+================
+
+You can use this library to authenticate with Channel Binding support. Channel
+Bindings are tags that identify the particular data channel being used with the
+authentication. You can use Channel bindings to offer more proof of a valid
+identity. Some services like Microsoft's Extended Protection can enforce
+Channel Binding support on authorisation and you can use this library to meet
+those requirements.
+
+More details on Channel Bindings as set through the GSSAPI can be found here
+<https://docs.oracle.com/cd/E19455-01/806-3814/overview-52/index.html>. Using
+TLS as a example this is how you would add Channel Binding support to your
+authentication mechanism. The following code snippet is based on RFC5929
+<https://tools.ietf.org/html/rfc5929> using the 'tls-server-endpoint-point'
+type.
+
+.. code-block:: python
+
+ import hashlib
+
+ def get_channel_bindings_application_data(socket):
+ # This is a highly simplified example, there are other use cases
+ # where you might need to use different hash types or get a socket
+ # object somehow.
+ server_certificate = socket.getpeercert(True)
+ certificate_hash =
hashlib.sha256(server_certificate).hexdigest().upper()
+ certificate_digest = base64.b16decode(certificate_hash)
+ application_data = b'tls-server-end-point:%s' % certificate_digest
+
+ return application_data
+
+ def main():
+ # Code to setup a socket with the server
+ # A lot of code to setup the handshake and start the auth process
+ socket = getsocketsomehow()
+
+ # Connect to the host and start the auth process
+
+ # Build the channel bindings object
+ application_data = get_channel_bindings_application_data(socket)
+ channel_bindings =
kerberos.channelBindings(application_data=application_data)
+
+ # More work to get responses from the server
+
+ result, context = kerberos.authGSSClientInit(kerb_spn,
gssflags=gssflags, principal=principal)
+
+ # Pass through the channel_bindings object as created in the
kerberos.channelBindings method
+ result = kerberos.authGSSClientStep(context, neg_resp_value,
channel_bindings=channel_bindings)
+
+ # Repeat as necessary
+
+
Python APIs
===========
@@ -61,7 +120,7 @@
Copyright and License
=====================
-Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+Copyright (c) 2006-2018 Apple Inc. All rights reserved.
This software is licensed under the Apache License, Version 2.0. The
Apache License is a well-established open source license, enabling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/kerberos.egg-info/PKG-INFO
new/kerberos-1.3.0/kerberos.egg-info/PKG-INFO
--- old/kerberos-1.2.5/kerberos.egg-info/PKG-INFO 2016-07-18
21:18:19.000000000 +0200
+++ new/kerberos-1.3.0/kerberos.egg-info/PKG-INFO 2018-03-08
22:07:34.000000000 +0100
@@ -1,14 +1,18 @@
Metadata-Version: 1.1
Name: kerberos
-Version: 1.2.5
+Version: 1.3.0
Summary: Kerberos high-level interface
-Home-page: http://www.calendarserver.org/
+Home-page: https://github.com/apple/ccs-pykerberos
Author: Apple Inc.
Author-email: [email protected]
License: Apache License, Version 2.0
+Description-Content-Type: UNKNOWN
Description: PyKerberos Package
==================
+ .. image:: https://travis-ci.org/apple/ccs-pykerberos.svg?branch=master
+ :target: https://travis-ci.org/apple/ccs-pykerberos
+
This Python package is a high-level wrapper for Kerberos (GSSAPI)
operations. The goal is to avoid having to build a module that wraps
the entire Kerberos.framework, and instead offer a limited set of
@@ -29,27 +33,30 @@
Testing
=======
- You must have a valid Kerberos setup on the test machine and you
- should ensure that you have valid Kerberos tickets for any client
- authentication being done (run 'klist' on the command line).
- Additionally, for the server: it must have been configured as a valid
- Kerberos service with the Kerbersos server for its realm - this
- usually requires running kadmin on the server machine to add the
- principal and generate a keytab entry for it (run 'sudo klist -k' to
- see the currently available keytab entries).
-
- Make sure that PYTHONPATH includes the appropriate build/lib.xxxx
- directory. Then run test.py with suitable command line arguments:
-
- python test.py -u userid -p password -s service
-
- -u
- user id for basic authenticate
- -p
- password for basic authenticate
- -s
- service principal for GSSAPI authentication (defaults to
- '[email protected]')
+ To run the tests in the tests folder, you must have a valid Kerberos
setup on
+ the test machine. You can use the script .travis.sh as quick and easy
way to
+ setup a Kerberos KDC and Apache web endpoint that can be used for the
tests.
+ Otherwise you can also run the following to run a self contained Docker
+ container
+
+ .. code-block: bash
+
+ docker run \
+ -v $(pwd):/app \
+ -w /app \
+ -e PYENV=2.7.13 \
+ -e KERBEROS_USERNAME=administrator \
+ -e KERBEROS_PASSWORD=Password01 \
+ -e KERBEROS_REALM=example.com \
+ -e KERBEROS_PORT=80 \
+ ubuntu:16.04 \
+ /bin/bash .travis.sh
+
+ The docker command needs to be run in the same directory as this
library and
+ you can test it with different Python versions by changing the value
of the
+ PYENV environment value set in the command.
+
+ Please have a look at testing_notes.md for more information.
IMPORTANT
@@ -60,6 +67,59 @@
production code.
+ Channel Bindings
+ ================
+
+ You can use this library to authenticate with Channel Binding support.
Channel
+ Bindings are tags that identify the particular data channel being used
with the
+ authentication. You can use Channel bindings to offer more proof of a
valid
+ identity. Some services like Microsoft's Extended Protection can
enforce
+ Channel Binding support on authorisation and you can use this library
to meet
+ those requirements.
+
+ More details on Channel Bindings as set through the GSSAPI can be
found here
+
<https://docs.oracle.com/cd/E19455-01/806-3814/overview-52/index.html>. Using
+ TLS as a example this is how you would add Channel Binding support to
your
+ authentication mechanism. The following code snippet is based on
RFC5929
+ <https://tools.ietf.org/html/rfc5929> using the
'tls-server-endpoint-point'
+ type.
+
+ .. code-block:: python
+
+ import hashlib
+
+ def get_channel_bindings_application_data(socket):
+ # This is a highly simplified example, there are other use
cases
+ # where you might need to use different hash types or get a
socket
+ # object somehow.
+ server_certificate = socket.getpeercert(True)
+ certificate_hash =
hashlib.sha256(server_certificate).hexdigest().upper()
+ certificate_digest = base64.b16decode(certificate_hash)
+ application_data = b'tls-server-end-point:%s' %
certificate_digest
+
+ return application_data
+
+ def main():
+ # Code to setup a socket with the server
+ # A lot of code to setup the handshake and start the auth
process
+ socket = getsocketsomehow()
+
+ # Connect to the host and start the auth process
+
+ # Build the channel bindings object
+ application_data =
get_channel_bindings_application_data(socket)
+ channel_bindings =
kerberos.channelBindings(application_data=application_data)
+
+ # More work to get responses from the server
+
+ result, context = kerberos.authGSSClientInit(kerb_spn,
gssflags=gssflags, principal=principal)
+
+ # Pass through the channel_bindings object as created in the
kerberos.channelBindings method
+ result = kerberos.authGSSClientStep(context, neg_resp_value,
channel_bindings=channel_bindings)
+
+ # Repeat as necessary
+
+
Python APIs
===========
@@ -69,7 +129,7 @@
Copyright and License
=====================
- Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2018 Apple Inc. All rights reserved.
This software is licensed under the Apache License, Version 2.0. The
Apache License is a well-established open source license, enabling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/pysrc/kerberos.py
new/kerberos-1.3.0/pysrc/kerberos.py
--- old/kerberos-1.2.5/pysrc/kerberos.py 2016-01-25 18:51:33.000000000
+0100
+++ new/kerberos-1.3.0/pysrc/kerberos.py 2018-03-08 21:00:27.000000000
+0100
@@ -1,5 +1,5 @@
##
-# Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2018 Apple Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -169,8 +169,9 @@
def authGSSClientClean(context):
"""
- Destroys the context for GSSAPI client-side authentication. After this call
- the context object is invalid and should not be used again.
+ Destroys the context for GSSAPI client-side authentication. This function
+ is provided for compatibility with earlier versions of PyKerberos but does
+ nothing. The context object destroys itself when it is reclaimed.
@param context: The context object returned from L{authGSSClientInit}.
@@ -193,7 +194,69 @@
-def authGSSClientStep(context, challenge):
+"""
+Address Types for Channel Bindings
+https://docs.oracle.com/cd/E19455-01/806-3814/6jcugr7dp/index.html#reference-9
+
+"""
+
+GSS_C_AF_UNSPEC = 0
+GSS_C_AF_LOCAL = 1
+GSS_C_AF_INET = 2
+GSS_C_AF_IMPLINK = 3
+GSS_C_AF_PUP = 4
+GSS_C_AF_CHAOS = 5
+GSS_C_AF_NS = 6
+GSS_C_AF_NBS = 7
+GSS_C_AF_ECMA = 8
+GSS_C_AF_DATAKIT = 9
+GSS_C_AF_CCITT = 10
+GSS_C_AF_SNA = 11
+GSS_C_AF_DECnet = 12
+GSS_C_AF_DLI = 13
+GSS_C_AF_LAT = 14
+GSS_C_AF_HYLINK = 15
+GSS_C_AF_APPLETALK = 16
+GSS_C_AF_BSC = 17
+GSS_C_AF_DSS = 18
+GSS_C_AF_OSI = 19
+GSS_C_AF_X25 = 21
+GSS_C_AF_NULLADDR = 255
+
+
+
+def channelBindings(**kwargs):
+ """
+ Builds a gss_channel_bindings_struct which can be used to pass onto
+ L{authGSSClientStep} to bind onto the auth. Details on Channel Bindings
+ can be foud at https://tools.ietf.org/html/rfc5929. More details on the
+ struct can be found at
+ https://docs.oracle.com/cd/E19455-01/806-3814/overview-52/index.html
+
+ @param initiator_addrtype: Optional integer used to set the
+ initiator_addrtype, defaults to GSS_C_AF_UNSPEC if not set
+
+ @param initiator_address: Optional byte string containing the
+ initiator_address
+
+ @param acceptor_addrtype: Optional integer used to set the
+ acceptor_addrtype, defaults to GSS_C_AF_UNSPEC if not set
+
+ @param acceptor_address: Optional byte string containing the
+ acceptor_address
+
+ @param application_data: Optional byte string containing the
+ application_data. An example would be
'tls-server-end-point:{cert-hash}'
+ where {cert-hash} is the hash of the server's certificate
+
+ @return: A tuple of (result, gss_channel_bindings_struct) where result is
+ the result code and gss_channel_bindings_struct is the channel bindings
+ structure that can be passed onto L{authGSSClientStep}
+ """
+
+
+
+def authGSSClientStep(context, challenge, **kwargs):
"""
Processes a single GSSAPI client-side step using the supplied server data.
@@ -202,6 +265,11 @@
@param challenge: A string containing the base64-encoded server data (which
may be empty for the first step).
+ @param channel_bindings: Optional channel bindings to bind onto the auth
+ request. This struct can be built using :{channelBindings}
+ and if not specified it will pass along GSS_C_NO_CHANNEL_BINDINGS as
+ a default.
+
@return: A result code (see above).
"""
@@ -295,8 +363,9 @@
def authGSSServerClean(context):
"""
- Destroys the context for GSSAPI server-side authentication.
- After this call the context object is invalid and should not be used again.
+ Destroys the context for GSSAPI server-side authentication. This function
+ is provided for compatibility with earlier versions of PyKerberos but does
+ nothing. The context object destroys itself when it is reclaimed.
@param context: The context object returned from L{authGSSClientInit}.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/setup.cfg new/kerberos-1.3.0/setup.cfg
--- old/kerberos-1.2.5/setup.cfg 2016-07-18 21:18:19.000000000 +0200
+++ new/kerberos-1.3.0/setup.cfg 2018-03-08 22:07:34.000000000 +0100
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/setup.py new/kerberos-1.3.0/setup.py
--- old/kerberos-1.2.5/setup.py 2016-07-18 21:18:04.000000000 +0200
+++ new/kerberos-1.3.0/setup.py 2018-03-08 21:00:27.000000000 +0100
@@ -1,5 +1,5 @@
##
-# Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2018 Apple Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -29,13 +29,13 @@
project_name = "kerberos"
-version_string = "1.2.5"
+version_string = "1.3.0"
description = "Kerberos high-level interface"
long_description = open(joinpath(dirname(__file__), "README.rst")).read()
-url = "http://www.calendarserver.org/";
+url = "https://github.com/apple/ccs-pykerberos";
classifiers = [
"Development Status :: 5 - Production/Stable",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/src/base64.c
new/kerberos-1.3.0/src/base64.c
--- old/kerberos-1.2.5/src/base64.c 2016-01-25 18:51:33.000000000 +0100
+++ new/kerberos-1.3.0/src/base64.c 2018-03-08 21:00:27.000000000 +0100
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2018 Apple Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/src/base64.h
new/kerberos-1.3.0/src/base64.h
--- old/kerberos-1.2.5/src/base64.h 2016-01-25 18:51:33.000000000 +0100
+++ new/kerberos-1.3.0/src/base64.h 2018-03-08 21:00:27.000000000 +0100
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2018 Apple Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/src/kerberos.c
new/kerberos-1.3.0/src/kerberos.c
--- old/kerberos-1.2.5/src/kerberos.c 2016-07-18 21:14:56.000000000 +0200
+++ new/kerberos-1.3.0/src/kerberos.c 2018-03-08 21:00:27.000000000 +0100
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2018 Apple Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +31,9 @@
// Basic renames (function parameters are the same)
// No more int objects
#define PyInt_FromLong PyLong_FromLong
+#endif
+
+#if PY_VERSION_HEX >= 0x03020000
// CObjects to Capsules
#define PyCObject_Check PyCapsule_CheckExact
#define PyCObject_SetVoidPtr PyCapsule_SetPointer
@@ -63,9 +66,6 @@
static char spnego_mech_oid_bytes[] = "\x2b\x06\x01\x05\x05\x02";
gss_OID_desc spnego_mech_oid = { 6, &spnego_mech_oid_bytes };
-char STATE_NULL_C = 'C';
-void* STATE_NULL = &STATE_NULL_C;
-
PyObject *KrbException_class;
PyObject *BasicAuthException_class;
PyObject *PwdChangeException_class;
@@ -133,6 +133,20 @@
}
}
+static void
+#if PY_VERSION_HEX >= 0x03020000
+destroy_gss_client(PyObject *obj) {
+ gss_client_state *state = PyCapsule_GetPointer(obj, NULL);
+#else
+destroy_gss_client(void *obj) {
+ gss_client_state *state = (gss_client_state *)obj;
+#endif
+ if (state) {
+ authenticate_gss_client_clean(state);
+ free(state);
+ }
+}
+
static PyObject* authGSSClientInit(PyObject* self, PyObject* args, PyObject*
keywds)
{
const char *service = NULL;
@@ -150,7 +164,7 @@
int result = 0;
if (! PyArg_ParseTupleAndKeywords(
- args, keywds, "s|slOO", kwlist,
+ args, keywds, "s|zlOO", kwlist,
&service, &principal, &gss_flags, &pydelegatestate, &pymech_oid
)) {
return NULL;
@@ -162,15 +176,14 @@
PyErr_NoMemory();
return NULL;
}
- pystate = PyCObject_FromVoidPtr(state, NULL);
+ pystate = PyCObject_FromVoidPtr(state, &destroy_gss_client);
if (pydelegatestate != NULL && PyCObject_Check(pydelegatestate)) {
- delegatestate = PyCObject_AsVoidPtr(pydelegatestate);
+ delegatestate =
(gss_server_state*)PyCObject_AsVoidPtr(pydelegatestate);
}
- if (pymech_oid != NULL && PyCapsule_CheckExact(pymech_oid)) {
- const char * mech_oid_name = PyCapsule_GetName(pymech_oid);
- mech_oid = PyCapsule_GetPointer(pymech_oid, mech_oid_name);
+ if (pymech_oid != NULL && PyCObject_Check(pymech_oid)) {
+ mech_oid = (gss_OID)PyCObject_AsVoidPtr(pymech_oid);
}
result = authenticate_gss_client_init(
@@ -186,39 +199,87 @@
static PyObject *authGSSClientClean(PyObject *self, PyObject *args)
{
- gss_client_state *state = NULL;
- PyObject *pystate = NULL;
- int result = 0;
+ return Py_BuildValue("i", AUTH_GSS_COMPLETE);
+}
- if (! PyArg_ParseTuple(args, "O", &pystate)) {
- return NULL;
+#if PY_VERSION_HEX >= 0x03020000
+void destruct_channel_bindings(PyObject* o) {
+ struct gss_channel_bindings_struct *channel_bindings =
PyCapsule_GetPointer(o, NULL);
+#else
+void destruct_channel_bindings(void* o) {
+ struct gss_channel_bindings_struct *channel_bindings = (struct
gss_channel_bindings_struct *)o;
+#endif
+
+ if (channel_bindings != NULL) {
+ if (channel_bindings->initiator_address.value != NULL) {
+ PyMem_Free(channel_bindings->initiator_address.value);
+ }
+
+ if (channel_bindings->acceptor_address.value != NULL) {
+ PyMem_Free(channel_bindings->acceptor_address.value);
+ }
+
+ if (channel_bindings->application_data.value != NULL) {
+ PyMem_Free(channel_bindings->application_data.value);
+ }
+
+ free(channel_bindings);
}
+}
- if (!PyCObject_Check(pystate)) {
- PyErr_SetString(PyExc_TypeError, "Expected a context object");
+static PyObject *channelBindings(PyObject *self, PyObject *args, PyObject*
keywds)
+{
+ int initiator_addrtype = GSS_C_AF_UNSPEC;
+ int acceptor_addrtype = GSS_C_AF_UNSPEC;
+
+ const char *encoding = NULL;
+ char *initiator_address = NULL;
+ char *acceptor_address = NULL;
+ char *application_data = NULL;
+ int initiator_length = 0;
+ int acceptor_length = 0;
+ int application_length = 0;
+
+ PyObject *pychan_bindings = NULL;
+ struct gss_channel_bindings_struct *input_chan_bindings;
+ static char *kwlist[] = {"initiator_addrtype", "initiator_address",
"acceptor_addrtype",
+ "acceptor_address", "application_data", NULL};
+
+ if (!PyArg_ParseTupleAndKeywords(args, keywds, "|iet#iet#et#", kwlist,
+ &initiator_addrtype, &encoding, &initiator_address,
&initiator_length,
+ &acceptor_addrtype, &encoding, &acceptor_address, &acceptor_length,
+ &encoding, &application_data, &application_length)) {
return NULL;
}
- state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
+ input_chan_bindings = (struct gss_channel_bindings_struct *)
malloc(sizeof(struct gss_channel_bindings_struct));
+ pychan_bindings = PyCObject_FromVoidPtr(input_chan_bindings,
&destruct_channel_bindings);
- if (state != STATE_NULL) {
- result = authenticate_gss_client_clean(state);
+ input_chan_bindings->initiator_addrtype = initiator_addrtype;
+ input_chan_bindings->initiator_address.length = initiator_length;
+ input_chan_bindings->initiator_address.value = initiator_address;
- free(state);
- PyCObject_SetVoidPtr(pystate, STATE_NULL);
- }
+ input_chan_bindings->acceptor_addrtype = acceptor_addrtype;
+ input_chan_bindings->acceptor_address.length = acceptor_length;
+ input_chan_bindings->acceptor_address.value = acceptor_address;
- return Py_BuildValue("i", result);
+ input_chan_bindings->application_data.length = application_length;
+ input_chan_bindings->application_data.value = application_data;
+
+ return Py_BuildValue("N", pychan_bindings);
}
-static PyObject *authGSSClientStep(PyObject *self, PyObject *args)
+static PyObject *authGSSClientStep(PyObject *self, PyObject *args, PyObject*
keywds)
{
gss_client_state *state = NULL;
PyObject *pystate = NULL;
char *challenge = NULL;
+ PyObject *pychan_bindings = NULL;
+ struct gss_channel_bindings_struct *channel_bindings;
+ static char *kwlist[] = {"state", "challenge", "channel_bindings", NULL};
int result = 0;
- if (! PyArg_ParseTuple(args, "Os", &pystate, &challenge)) {
+ if (! PyArg_ParseTupleAndKeywords(args, keywds, "Os|O", kwlist, &pystate,
&challenge, &pychan_bindings)) {
return NULL;
}
@@ -229,11 +290,21 @@
state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
- result = authenticate_gss_client_step(state, challenge);
+ if (pychan_bindings == NULL) {
+ channel_bindings = GSS_C_NO_CHANNEL_BINDINGS;
+ } else {
+ if (!PyCObject_Check(pychan_bindings)) {
+ PyErr_SetString(PyExc_TypeError, "Expected a
gss_channel_bindings_struct object");
+ return NULL;
+ }
+ channel_bindings = (struct gss_channel_bindings_struct
*)PyCObject_AsVoidPtr(pychan_bindings);
+ }
+
+ result = authenticate_gss_client_step(state, challenge, channel_bindings);
if (result == AUTH_GSS_ERROR) {
return NULL;
@@ -258,7 +329,7 @@
state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -281,7 +352,7 @@
state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -304,7 +375,7 @@
state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -327,7 +398,7 @@
state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -352,7 +423,7 @@
state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -387,7 +458,7 @@
state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -415,7 +486,7 @@
}
state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -427,6 +498,20 @@
return Py_BuildValue("i", result);
}
+static void
+#if PY_VERSION_HEX >= 0x03020000
+destroy_gss_server(PyObject *obj) {
+ gss_server_state *state = PyCapsule_GetPointer(obj, NULL);
+#else
+destroy_gss_server(void *obj) {
+ gss_server_state *state = (gss_server_state *)obj;
+#endif
+ if (state) {
+ authenticate_gss_server_clean(state);
+ free(state);
+ }
+}
+
static PyObject *authGSSServerInit(PyObject *self, PyObject *args)
{
const char *service = NULL;
@@ -444,7 +529,7 @@
PyErr_NoMemory();
return NULL;
}
- pystate = PyCObject_FromVoidPtr(state, NULL);
+ pystate = PyCObject_FromVoidPtr(state, &destroy_gss_server);
result = authenticate_gss_server_init(service, state);
@@ -457,29 +542,7 @@
static PyObject *authGSSServerClean(PyObject *self, PyObject *args)
{
- gss_server_state *state = NULL;
- PyObject *pystate = NULL;
- int result = 0;
-
- if (! PyArg_ParseTuple(args, "O", &pystate)) {
- return NULL;
- }
-
- if (! PyCObject_Check(pystate)) {
- PyErr_SetString(PyExc_TypeError, "Expected a context object");
- return NULL;
- }
-
- state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
-
- if (state != STATE_NULL) {
- result = authenticate_gss_server_clean(state);
-
- free(state);
- PyCObject_SetVoidPtr(pystate, STATE_NULL);
- }
-
- return Py_BuildValue("i", result);
+ return Py_BuildValue("i", AUTH_GSS_COMPLETE);
}
static PyObject *authGSSServerStep(PyObject *self, PyObject *args)
@@ -500,7 +563,7 @@
state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -530,7 +593,7 @@
state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -559,7 +622,7 @@
state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -582,7 +645,7 @@
state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -605,7 +668,7 @@
state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -628,7 +691,7 @@
state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
- if (state == STATE_NULL) {
+ if (state == NULL) {
return NULL;
}
@@ -657,13 +720,18 @@
"Initialize client-side GSSAPI operations."
},
{
+ "channelBindings",
+ (PyCFunction)channelBindings, METH_VARARGS | METH_KEYWORDS,
+ "Build the Channel Bindings Structure for authGSSClientStep."
+ },
+ {
"authGSSClientClean",
authGSSClientClean, METH_VARARGS,
"Terminate client-side GSSAPI operations."
},
{
"authGSSClientStep",
- authGSSClientStep, METH_VARARGS,
+ (PyCFunction)authGSSClientStep, METH_VARARGS | METH_KEYWORDS,
"Do a client-side GSSAPI step."
},
{
@@ -834,10 +902,10 @@
d, "GSS_C_TRANS_FLAG", PyInt_FromLong(GSS_C_TRANS_FLAG)
);
PyDict_SetItemString(
- d, "GSS_MECH_OID_KRB5", PyCapsule_New(&krb5_mech_oid,
"kerberos.GSS_MECH_OID_KRB5", NULL)
+ d, "GSS_MECH_OID_KRB5", PyCObject_FromVoidPtr(&krb5_mech_oid, NULL)
);
PyDict_SetItemString(
- d, "GSS_MECH_OID_SPNEGO", PyCapsule_New(&spnego_mech_oid,
"kerberos.GSS_MECH_OID_SPNEGO", NULL)
+ d, "GSS_MECH_OID_SPNEGO", PyCObject_FromVoidPtr(&spnego_mech_oid, NULL)
);
error:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/src/kerberosbasic.c
new/kerberos-1.3.0/src/kerberosbasic.c
--- old/kerberos-1.2.5/src/kerberosbasic.c 2016-01-25 18:51:33.000000000
+0100
+++ new/kerberos-1.3.0/src/kerberosbasic.c 2018-03-08 21:00:27.000000000
+0100
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2018 Apple Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/src/kerberosbasic.h
new/kerberos-1.3.0/src/kerberosbasic.h
--- old/kerberos-1.2.5/src/kerberosbasic.h 2016-01-25 18:51:33.000000000
+0100
+++ new/kerberos-1.3.0/src/kerberosbasic.h 2018-03-08 21:00:27.000000000
+0100
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2018 Apple Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/src/kerberosgss.c
new/kerberos-1.3.0/src/kerberosgss.c
--- old/kerberos-1.2.5/src/kerberosgss.c 2016-01-25 18:51:33.000000000
+0100
+++ new/kerberos-1.3.0/src/kerberosgss.c 2018-03-08 21:00:27.000000000
+0100
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2018 Apple Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -232,7 +232,7 @@
}
int authenticate_gss_client_step(
- gss_client_state* state, const char* challenge
+ gss_client_state* state, const char* challenge, struct
gss_channel_bindings_struct* channel_bindings
) {
OM_uint32 maj_stat;
OM_uint32 min_stat;
@@ -269,7 +269,7 @@
state->mech_oid,
(OM_uint32)state->gss_flags,
0,
- GSS_C_NO_CHANNEL_BINDINGS,
+ channel_bindings,
&input_token,
NULL,
&output_token,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kerberos-1.2.5/src/kerberosgss.h
new/kerberos-1.3.0/src/kerberosgss.h
--- old/kerberos-1.2.5/src/kerberosgss.h 2016-01-25 18:51:33.000000000
+0100
+++ new/kerberos-1.3.0/src/kerberosgss.h 2018-03-08 21:00:27.000000000
+0100
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2006-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2018 Apple Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@
gss_client_state *state
);
int authenticate_gss_client_step(
- gss_client_state *state, const char *challenge
+ gss_client_state *state, const char *challenge, struct
gss_channel_bindings_struct *channel_bindings
);
int authenticate_gss_client_unwrap(
gss_client_state* state, const char* challenge
