From 492b9109aa4d2f80b683b1eee50747e897d69a0f Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Tue, 17 Apr 2018 17:27:54 +0000 Subject: [PATCH] Formatting changes (no code changes) New git behavior, ugh. --- ...ncoders-and-decoders-for-SPAKE-types.patch | 20 +++--- ...INIT-KDC-support-for-freshness-token.patch | 12 ++-- Add-SPAKE-preauth-support.patch | 70 +++++++++---------- Add-k5_buf_add_vfmt-to-k5buf-interface.patch | 4 +- ...bkrb5support-hex-functions-and-tests.patch | 8 +-- ...ul-asking-for-AS-key-in-SPAKE-client.patch | 2 +- Fix-flaws-in-LDAP-DN-checking.patch | 8 +-- ...-conversion-of-PKINIT-certid-strings.patch | 2 +- Implement-k5_buf_init_dynamic_zap.patch | 4 +- ...uth-name-in-trace-output-if-possible.patch | 8 +-- Move-zap-definition-to-k5-platform.h.patch | 4 +- ...r-KDC-krb5_pa_data-utility-functions.patch | 6 +- ...ct-pre-authentication-fallback-cases.patch | 14 ++-- Return-UPN-SANs-as-strings.patch | 8 +-- ...ately-and-unparse-them-with-NO_REALM.patch | 6 +- Simplify-kdc_preauth.c-systems-table.patch | 2 +- ...port-hex-functions-where-appropriate.patch | 38 +++++----- krb5-1.12-ktany.patch | 2 +- krb5-1.12.1-pam.patch | 8 +-- krb5-1.13-dirsrv-accountlock.patch | 6 +- krb5-1.15.1-selinux-label.patch | 50 ++++++------- 21 files changed, 141 insertions(+), 141 deletions(-) diff --git a/Add-ASN.1-encoders-and-decoders-for-SPAKE-types.patch b/Add-ASN.1-encoders-and-decoders-for-SPAKE-types.patch index b2ef69d..52cd463 100644 --- a/Add-ASN.1-encoders-and-decoders-for-SPAKE-types.patch +++ b/Add-ASN.1-encoders-and-decoders-for-SPAKE-types.patch @@ -14,21 +14,21 @@ build. (cherry picked from commit 78a09d95dff6915da4079bc611f4bb95f6a95f70) --- - src/include/k5-spake.h | 107 +++++++++++++++++++++++++++++++++++ - src/lib/krb5/asn.1/asn1_k_encode.c | 52 ++++++++++++++++- - src/lib/krb5/krb/kfree.c | 40 +++++++++++++ + src/include/k5-spake.h | 107 +++++++++++++++++++++++++++ + src/lib/krb5/asn.1/asn1_k_encode.c | 52 ++++++++++++- + src/lib/krb5/krb/kfree.c | 40 ++++++++++ src/lib/krb5/libkrb5.exports | 6 ++ src/tests/asn.1/Makefile.in | 2 +- - src/tests/asn.1/krb5_decode_test.c | 37 ++++++++++++ - src/tests/asn.1/krb5_encode_test.c | 29 ++++++++++ - src/tests/asn.1/ktest.c | 97 +++++++++++++++++++++++++++++++ + src/tests/asn.1/krb5_decode_test.c | 37 +++++++++ + src/tests/asn.1/krb5_encode_test.c | 29 ++++++++ + src/tests/asn.1/ktest.c | 97 ++++++++++++++++++++++++ src/tests/asn.1/ktest.h | 9 +++ - src/tests/asn.1/ktest_equal.c | 49 ++++++++++++++++ + src/tests/asn.1/ktest_equal.c | 49 ++++++++++++ src/tests/asn.1/ktest_equal.h | 6 ++ - src/tests/asn.1/make-vectors.c | 56 ++++++++++++++++++ + src/tests/asn.1/make-vectors.c | 56 ++++++++++++++ src/tests/asn.1/reference_encode.out | 6 ++ - src/tests/asn.1/spake.asn1 | 44 ++++++++++++++ - src/tests/asn.1/trval_reference.out | 50 ++++++++++++++++ + src/tests/asn.1/spake.asn1 | 44 +++++++++++ + src/tests/asn.1/trval_reference.out | 50 +++++++++++++ 15 files changed, 588 insertions(+), 2 deletions(-) create mode 100644 src/include/k5-spake.h create mode 100644 src/tests/asn.1/spake.asn1 diff --git a/Add-PKINIT-KDC-support-for-freshness-token.patch b/Add-PKINIT-KDC-support-for-freshness-token.patch index a2630db..94830f4 100644 --- a/Add-PKINIT-KDC-support-for-freshness-token.patch +++ b/Add-PKINIT-KDC-support-for-freshness-token.patch @@ -26,18 +26,18 @@ ticket: 8648 (cherry picked from commit 4a9050df0bc34bfb08ba24462d6e2514640f4b8e) --- doc/admin/conf_files/kdc_conf.rst | 4 + - doc/admin/pkinit.rst | 25 ++++++ + doc/admin/pkinit.rst | 25 +++++ doc/appdev/refs/macros/index.rst | 2 + - doc/formats/freshness_token.rst | 19 +++++ + doc/formats/freshness_token.rst | 19 ++++ doc/formats/index.rst | 1 + - src/include/krb5/kdcpreauth_plugin.h | 17 +++++ + src/include/krb5/kdcpreauth_plugin.h | 17 ++++ src/include/krb5/krb5.hin | 3 + src/kdc/do_as_req.c | 2 + - src/kdc/kdc_preauth.c | 130 +++++++++++++++++++++++++++++++- + src/kdc/kdc_preauth.c | 130 +++++++++++++++++++++++- src/kdc/kdc_util.h | 2 + src/plugins/preauth/pkinit/pkinit.h | 2 + - src/plugins/preauth/pkinit/pkinit_srv.c | 51 ++++++++++++- - src/tests/t_pkinit.py | 50 ++++++++---- + src/plugins/preauth/pkinit/pkinit_srv.c | 51 +++++++++- + src/tests/t_pkinit.py | 50 ++++++--- 13 files changed, 292 insertions(+), 16 deletions(-) create mode 100644 doc/formats/freshness_token.rst diff --git a/Add-SPAKE-preauth-support.patch b/Add-SPAKE-preauth-support.patch index 0afb0dc..8f67729 100644 --- a/Add-SPAKE-preauth-support.patch +++ b/Add-SPAKE-preauth-support.patch @@ -48,41 +48,41 @@ registry contents; implemented P-384 and P-521] ticket: 8647 (new) (cherry picked from commit 7447259401569c92b1fb2e31cb02edbbffd67d35) --- - NOTICE | 51 + - doc/admin/conf_files/kdc_conf.rst | 22 +- - doc/admin/conf_files/krb5_conf.rst | 15 + - doc/admin/index.rst | 1 + - doc/admin/spake.rst | 46 + - doc/formats/cookie.rst | 37 + - doc/notice.rst | 47 + - src/Makefile.in | 2 + - src/config/pre.in | 6 + - src/configure.in | 20 + - src/include/k5-int.h | 3 + - src/include/krb5/krb5.hin | 2 + - src/kdc/kdc_preauth.c | 2 + - src/lib/krb5/krb/preauth2.c | 2 + - src/lib/krb5/os/trace.c | 1 + - src/plugins/preauth/spake/AUTHORS | 16 + - src/plugins/preauth/spake/Makefile.in | 39 + - src/plugins/preauth/spake/deps | 73 + - src/plugins/preauth/spake/edwards25519.c | 2651 ++++++++ - src/plugins/preauth/spake/edwards25519_tables.h | 7881 +++++++++++++++++++++++ - src/plugins/preauth/spake/groups.c | 442 ++ - src/plugins/preauth/spake/groups.h | 148 + - src/plugins/preauth/spake/iana.c | 108 + - src/plugins/preauth/spake/iana.h | 65 + - src/plugins/preauth/spake/openssl.c | 315 + - src/plugins/preauth/spake/spake.exports | 2 + - src/plugins/preauth/spake/spake_client.c | 363 ++ - src/plugins/preauth/spake/spake_kdc.c | 590 ++ - src/plugins/preauth/spake/t_krb5.conf | 2 + - src/plugins/preauth/spake/t_vectors.c | 476 ++ - src/plugins/preauth/spake/trace.h | 74 + - src/plugins/preauth/spake/util.c | 211 + - src/plugins/preauth/spake/util.h | 56 + - src/tests/Makefile.in | 1 + - src/tests/t_spake.py | 151 + + NOTICE | 51 + + doc/admin/conf_files/kdc_conf.rst | 22 +- + doc/admin/conf_files/krb5_conf.rst | 15 + + doc/admin/index.rst | 1 + + doc/admin/spake.rst | 46 + + doc/formats/cookie.rst | 37 + + doc/notice.rst | 47 + + src/Makefile.in | 2 + + src/config/pre.in | 6 + + src/configure.in | 20 + + src/include/k5-int.h | 3 + + src/include/krb5/krb5.hin | 2 + + src/kdc/kdc_preauth.c | 2 + + src/lib/krb5/krb/preauth2.c | 2 + + src/lib/krb5/os/trace.c | 1 + + src/plugins/preauth/spake/AUTHORS | 16 + + src/plugins/preauth/spake/Makefile.in | 39 + + src/plugins/preauth/spake/deps | 73 + + src/plugins/preauth/spake/edwards25519.c | 2651 ++++++ + .../preauth/spake/edwards25519_tables.h | 7881 +++++++++++++++++ + src/plugins/preauth/spake/groups.c | 442 + + src/plugins/preauth/spake/groups.h | 148 + + src/plugins/preauth/spake/iana.c | 108 + + src/plugins/preauth/spake/iana.h | 65 + + src/plugins/preauth/spake/openssl.c | 315 + + src/plugins/preauth/spake/spake.exports | 2 + + src/plugins/preauth/spake/spake_client.c | 363 + + src/plugins/preauth/spake/spake_kdc.c | 590 ++ + src/plugins/preauth/spake/t_krb5.conf | 2 + + src/plugins/preauth/spake/t_vectors.c | 476 + + src/plugins/preauth/spake/trace.h | 74 + + src/plugins/preauth/spake/util.c | 211 + + src/plugins/preauth/spake/util.h | 56 + + src/tests/Makefile.in | 1 + + src/tests/t_spake.py | 151 + 35 files changed, 13917 insertions(+), 4 deletions(-) create mode 100644 doc/admin/spake.rst create mode 100644 src/plugins/preauth/spake/AUTHORS diff --git a/Add-k5_buf_add_vfmt-to-k5buf-interface.patch b/Add-k5_buf_add_vfmt-to-k5buf-interface.patch index e6dae99..d9b8d94 100644 --- a/Add-k5_buf_add_vfmt-to-k5buf-interface.patch +++ b/Add-k5_buf_add_vfmt-to-k5buf-interface.patch @@ -5,8 +5,8 @@ Subject: [PATCH] Add k5_buf_add_vfmt to k5buf interface (cherry picked from commit f05766469efc2a055085c0bcf9d40c4cdf47fe36) --- - src/include/k5-buf.h | 8 ++++++++ - src/util/support/k5buf.c | 26 +++++++++++++++----------- + src/include/k5-buf.h | 8 ++++++ + src/util/support/k5buf.c | 26 +++++++++++-------- src/util/support/libkrb5support-fixed.exports | 1 + 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Add-libkrb5support-hex-functions-and-tests.patch b/Add-libkrb5support-hex-functions-and-tests.patch index 88a1be7..7b769ab 100644 --- a/Add-libkrb5support-hex-functions-and-tests.patch +++ b/Add-libkrb5support-hex-functions-and-tests.patch @@ -6,12 +6,12 @@ Subject: [PATCH] Add libkrb5support hex functions and tests (cherry picked from commit 720dea558da0062d3cea4385327161e62cf09a5e) [rharwood@redhat.com Remove .gitignore] --- - src/include/k5-hex.h | 53 ++++++++ - src/util/support/Makefile.in | 15 ++- + src/include/k5-hex.h | 53 ++++++ + src/util/support/Makefile.in | 15 +- src/util/support/deps | 6 + - src/util/support/hex.c | 116 ++++++++++++++++++ + src/util/support/hex.c | 116 ++++++++++++ src/util/support/libkrb5support-fixed.exports | 2 + - src/util/support/t_hex.c | 169 ++++++++++++++++++++++++++ + src/util/support/t_hex.c | 169 ++++++++++++++++++ 6 files changed, 358 insertions(+), 3 deletions(-) create mode 100644 src/include/k5-hex.h create mode 100644 src/util/support/hex.c diff --git a/Be-more-careful-asking-for-AS-key-in-SPAKE-client.patch b/Be-more-careful-asking-for-AS-key-in-SPAKE-client.patch index ac80178..287b3f9 100644 --- a/Be-more-careful-asking-for-AS-key-in-SPAKE-client.patch +++ b/Be-more-careful-asking-for-AS-key-in-SPAKE-client.patch @@ -20,7 +20,7 @@ spake_prep_questions() without a prototype. ticket: 8659 (cherry picked from commit f240f1b0d324312be8aa59ead7cfbe0c329ed064) --- - src/plugins/preauth/spake/spake_client.c | 111 ++++++++++++++++++------------- + src/plugins/preauth/spake/spake_client.c | 111 ++++++++++++++--------- 1 file changed, 66 insertions(+), 45 deletions(-) diff --git a/src/plugins/preauth/spake/spake_client.c b/src/plugins/preauth/spake/spake_client.c diff --git a/Fix-flaws-in-LDAP-DN-checking.patch b/Fix-flaws-in-LDAP-DN-checking.patch index 4a775bb..fc3f23c 100644 --- a/Fix-flaws-in-LDAP-DN-checking.patch +++ b/Fix-flaws-in-LDAP-DN-checking.patch @@ -41,10 +41,10 @@ target_version: 1.15-next (cherry picked from commit e1caf6fb74981da62039846931ebdffed71309d1) --- - src/lib/kadm5/srv/svr_principal.c | 7 + - src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h | 2 +- - src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c | 200 +++++++++++---------- - src/tests/t_kdb.py | 11 ++ + src/lib/kadm5/srv/svr_principal.c | 7 + + src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h | 2 +- + .../kdb/ldap/libkdb_ldap/ldap_principal2.c | 200 ++++++++++-------- + src/tests/t_kdb.py | 11 + 4 files changed, 125 insertions(+), 95 deletions(-) diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c diff --git a/Fix-hex-conversion-of-PKINIT-certid-strings.patch b/Fix-hex-conversion-of-PKINIT-certid-strings.patch index 6acb007..bc21999 100644 --- a/Fix-hex-conversion-of-PKINIT-certid-strings.patch +++ b/Fix-hex-conversion-of-PKINIT-certid-strings.patch @@ -13,7 +13,7 @@ commit message] ticket: 8636 (cherry picked from commit 63e8b8142fd7b3931a7bf2d6448978ca536bafc0) --- - src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 55 +++++++++++++++++----- + .../preauth/pkinit/pkinit_crypto_openssl.c | 55 +++++++++++++++---- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c diff --git a/Implement-k5_buf_init_dynamic_zap.patch b/Implement-k5_buf_init_dynamic_zap.patch index 2b5656c..94ba25f 100644 --- a/Implement-k5_buf_init_dynamic_zap.patch +++ b/Implement-k5_buf_init_dynamic_zap.patch @@ -8,8 +8,8 @@ reallocating or freeing the buffer. (cherry picked from commit 8ee8246c14702dc03b02e31b9fb5b7c2bb674bfb) --- - src/include/k5-buf.h | 6 +++- - src/util/support/k5buf.c | 41 +++++++++++++++++++++------ + src/include/k5-buf.h | 6 ++- + src/util/support/k5buf.c | 41 +++++++++++++++---- src/util/support/libkrb5support-fixed.exports | 1 + 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/Include-preauth-name-in-trace-output-if-possible.patch b/Include-preauth-name-in-trace-output-if-possible.patch index ca12e6f..e5c024a 100644 --- a/Include-preauth-name-in-trace-output-if-possible.patch +++ b/Include-preauth-name-in-trace-output-if-possible.patch @@ -12,11 +12,11 @@ and use it when formatting {patype} or {patypes}. ticket: 8653 (new) (cherry picked from commit 9c68fe39b018666eabe033b639c1f35d03ba51c7) --- - src/include/k5-trace.h | 17 ++-- + src/include/k5-trace.h | 17 +-- src/lib/krb5/os/t_trace.ref | 2 +- - src/lib/krb5/os/trace.c | 61 ++++++++++++- - src/tests/t_pkinit.py | 43 ++++----- - src/tests/t_preauth.py | 216 ++++++++++++++++++++++---------------------- + src/lib/krb5/os/trace.c | 61 +++++++++- + src/tests/t_pkinit.py | 43 +++---- + src/tests/t_preauth.py | 216 ++++++++++++++++++------------------ 5 files changed, 200 insertions(+), 139 deletions(-) diff --git a/src/include/k5-trace.h b/src/include/k5-trace.h diff --git a/Move-zap-definition-to-k5-platform.h.patch b/Move-zap-definition-to-k5-platform.h.patch index dc4e696..9d08931 100644 --- a/Move-zap-definition-to-k5-platform.h.patch +++ b/Move-zap-definition-to-k5-platform.h.patch @@ -8,8 +8,8 @@ include k5-int.h by moving its definition to k5-platform.h. (cherry picked from commit df6bef6f9ea6a5f6f3956a2988cd658c78aae817) --- - src/include/k5-int.h | 45 --------------------------------------------- - src/include/k5-platform.h | 47 ++++++++++++++++++++++++++++++++++++++++++++++- + src/include/k5-int.h | 45 ------------------------------------- + src/include/k5-platform.h | 47 ++++++++++++++++++++++++++++++++++++++- src/util/support/zap.c | 4 ++-- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Refactor-KDC-krb5_pa_data-utility-functions.patch b/Refactor-KDC-krb5_pa_data-utility-functions.patch index 664e99b..0dedd1f 100644 --- a/Refactor-KDC-krb5_pa_data-utility-functions.patch +++ b/Refactor-KDC-krb5_pa_data-utility-functions.patch @@ -17,10 +17,10 @@ where applicable. (cherry picked from commit 4af478c18b02e1d2444a328bb79e6976ef3d312b) --- - src/kdc/fast_util.c | 28 +------- + src/kdc/fast_util.c | 28 +------ src/kdc/kdc_preauth.c | 14 ++-- - src/kdc/kdc_util.c | 187 +++++++++++++++++++++++++------------------------- - src/kdc/kdc_util.h | 8 +-- + src/kdc/kdc_util.c | 187 +++++++++++++++++++++--------------------- + src/kdc/kdc_util.h | 8 +- 4 files changed, 109 insertions(+), 128 deletions(-) diff --git a/src/kdc/fast_util.c b/src/kdc/fast_util.c diff --git a/Restrict-pre-authentication-fallback-cases.patch b/Restrict-pre-authentication-fallback-cases.patch index 0d42ba8..f5cf87e 100644 --- a/Restrict-pre-authentication-fallback-cases.patch +++ b/Restrict-pre-authentication-fallback-cases.patch @@ -17,20 +17,20 @@ retried after a failure. ticket: 8654 (cherry picked from commit 7a24a088c16d326127dd2b29084d4ca085c70d10) --- - src/include/krb5/clpreauth_plugin.h | 14 +++++ - src/lib/krb5/krb/get_in_tkt.c | 21 +++----- + src/include/krb5/clpreauth_plugin.h | 14 ++++ + src/lib/krb5/krb/get_in_tkt.c | 21 +++--- src/lib/krb5/krb/init_creds_ctx.h | 1 + - src/lib/krb5/krb/int-proto.h | 3 -- - src/lib/krb5/krb/preauth2.c | 23 ++++----- + src/lib/krb5/krb/int-proto.h | 3 - + src/lib/krb5/krb/preauth2.c | 23 +++---- src/lib/krb5/krb/preauth_ec.c | 1 + src/lib/krb5/krb/preauth_encts.c | 2 + src/lib/krb5/krb/preauth_otp.c | 4 ++ src/lib/krb5/krb/preauth_sam2.c | 1 + src/plugins/preauth/pkinit/pkinit_clnt.c | 1 + src/plugins/preauth/spake/spake_client.c | 4 ++ - src/plugins/preauth/test/cltest.c | 11 ++++ - src/tests/t_preauth.py | 88 ++++++++++++++++++++++++++++---- - src/tests/t_spake.py | 9 +--- + src/plugins/preauth/test/cltest.c | 11 +++ + src/tests/t_preauth.py | 88 +++++++++++++++++++++--- + src/tests/t_spake.py | 9 +-- 14 files changed, 134 insertions(+), 49 deletions(-) diff --git a/src/include/krb5/clpreauth_plugin.h b/src/include/krb5/clpreauth_plugin.h diff --git a/Return-UPN-SANs-as-strings.patch b/Return-UPN-SANs-as-strings.patch index d8aab07..78a458e 100644 --- a/Return-UPN-SANs-as-strings.patch +++ b/Return-UPN-SANs-as-strings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Return UPN SANs as strings (cherry picked from commit fd3c824e3be56a1fa77d140fd7e93934bfd6e565) --- - src/plugins/preauth/pkinit/pkinit_crypto.h | 4 ++-- - src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 28 ++++++++-------------- - src/plugins/preauth/pkinit/pkinit_matching.c | 16 +++---------- - src/plugins/preauth/pkinit/pkinit_srv.c | 21 ++++++++++------ + src/plugins/preauth/pkinit/pkinit_crypto.h | 4 +-- + .../preauth/pkinit/pkinit_crypto_openssl.c | 28 +++++++------------ + src/plugins/preauth/pkinit/pkinit_matching.c | 16 ++--------- + src/plugins/preauth/pkinit/pkinit_srv.c | 21 +++++++++----- 4 files changed, 29 insertions(+), 40 deletions(-) diff --git a/src/plugins/preauth/pkinit/pkinit_crypto.h b/src/plugins/preauth/pkinit/pkinit_crypto.h diff --git a/Save-SANs-separately-and-unparse-them-with-NO_REALM.patch b/Save-SANs-separately-and-unparse-them-with-NO_REALM.patch index 689ed40..9375e07 100644 --- a/Save-SANs-separately-and-unparse-them-with-NO_REALM.patch +++ b/Save-SANs-separately-and-unparse-them-with-NO_REALM.patch @@ -5,9 +5,9 @@ Subject: [PATCH] Save SANs separately and unparse them with NO_REALM (cherry picked from commit 23ea8d6a9617d17ae5a529c23174d77adac39055) --- - src/plugins/preauth/pkinit/pkinit_crypto.h | 4 +-- - src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 37 +++------------------- - src/plugins/preauth/pkinit/pkinit_matching.c | 30 +++++++++++++----- + src/plugins/preauth/pkinit/pkinit_crypto.h | 4 +- + .../preauth/pkinit/pkinit_crypto_openssl.c | 37 ++----------------- + src/plugins/preauth/pkinit/pkinit_matching.c | 30 +++++++++++---- 3 files changed, 28 insertions(+), 43 deletions(-) diff --git a/src/plugins/preauth/pkinit/pkinit_crypto.h b/src/plugins/preauth/pkinit/pkinit_crypto.h diff --git a/Simplify-kdc_preauth.c-systems-table.patch b/Simplify-kdc_preauth.c-systems-table.patch index fad6fc4..a8d1ded 100644 --- a/Simplify-kdc_preauth.c-systems-table.patch +++ b/Simplify-kdc_preauth.c-systems-table.patch @@ -16,7 +16,7 @@ since it was first added. (cherry picked from commit fea1a488924faa3938ef723feaa1ff12d22a91ff) --- - src/kdc/kdc_preauth.c | 526 ++++++++++++++++++-------------------------------- + src/kdc/kdc_preauth.c | 526 +++++++++++++++--------------------------- 1 file changed, 184 insertions(+), 342 deletions(-) diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c diff --git a/Use-libkrb5support-hex-functions-where-appropriate.patch b/Use-libkrb5support-hex-functions-where-appropriate.patch index e706d8e..0e3e26b 100644 --- a/Use-libkrb5support-hex-functions-where-appropriate.patch +++ b/Use-libkrb5support-hex-functions-where-appropriate.patch @@ -5,25 +5,25 @@ Subject: [PATCH] Use libkrb5support hex functions where appropriate (cherry picked from commit b0c700608be7455041a8afc0e4502e8783ee7f30) --- - src/kadmin/dbutil/deps | 16 +++--- - src/kadmin/dbutil/tabdump.c | 19 +++---- - src/kadmin/ktutil/deps | 13 +++-- - src/kadmin/ktutil/ktutil_funcs.c | 30 ++++------ - src/lib/crypto/crypto_tests/deps | 39 +++++++------ - src/lib/crypto/crypto_tests/t_cksum.c | 35 +++--------- - src/lib/crypto/crypto_tests/t_crc.c | 28 ++-------- - src/lib/crypto/crypto_tests/t_hmac.c | 34 +++++------ - src/plugins/kdb/ldap/ldap_util/deps | 18 +++--- - .../kdb/ldap/ldap_util/kdb5_ldap_services.c | 32 ++++------- - .../kdb/ldap/ldap_util/kdb5_ldap_services.h | 2 - - src/plugins/kdb/ldap/libkdb_ldap/deps | 19 ++++--- - .../kdb/ldap/libkdb_ldap/ldap_service_stash.c | 65 +++------------------- - .../kdb/ldap/libkdb_ldap/ldap_service_stash.h | 3 - - .../kdb/ldap/libkdb_ldap/libkdb_ldap.exports | 1 - - src/slave/deps | 15 ++--- - src/slave/kproplog.c | 11 ++-- - src/tests/gssapi/deps | 14 ++--- - src/tests/gssapi/t_prf.c | 13 +++-- + src/kadmin/dbutil/deps | 16 ++--- + src/kadmin/dbutil/tabdump.c | 19 +++--- + src/kadmin/ktutil/deps | 13 ++-- + src/kadmin/ktutil/ktutil_funcs.c | 30 ++++----- + src/lib/crypto/crypto_tests/deps | 39 ++++++----- + src/lib/crypto/crypto_tests/t_cksum.c | 35 +++------- + src/lib/crypto/crypto_tests/t_crc.c | 28 ++------ + src/lib/crypto/crypto_tests/t_hmac.c | 34 +++++----- + src/plugins/kdb/ldap/ldap_util/deps | 18 ++--- + .../kdb/ldap/ldap_util/kdb5_ldap_services.c | 32 +++------ + .../kdb/ldap/ldap_util/kdb5_ldap_services.h | 2 - + src/plugins/kdb/ldap/libkdb_ldap/deps | 19 +++--- + .../kdb/ldap/libkdb_ldap/ldap_service_stash.c | 65 +++---------------- + .../kdb/ldap/libkdb_ldap/ldap_service_stash.h | 3 - + .../kdb/ldap/libkdb_ldap/libkdb_ldap.exports | 1 - + src/slave/deps | 15 +++-- + src/slave/kproplog.c | 11 ++-- + src/tests/gssapi/deps | 14 ++-- + src/tests/gssapi/t_prf.c | 13 ++-- 19 files changed, 152 insertions(+), 255 deletions(-) diff --git a/src/kadmin/dbutil/deps b/src/kadmin/dbutil/deps diff --git a/krb5-1.12-ktany.patch b/krb5-1.12-ktany.patch index f48ba8d..b7e5ef1 100644 --- a/krb5-1.12-ktany.patch +++ b/krb5-1.12-ktany.patch @@ -8,7 +8,7 @@ when searching for a specific entry. When iterated through, it only presents the contents of the first keytab. --- src/lib/krb5/keytab/Makefile.in | 3 + - src/lib/krb5/keytab/kt_any.c | 292 ++++++++++++++++++++++++++++++++++++++++ + src/lib/krb5/keytab/kt_any.c | 292 ++++++++++++++++++++++++++++++++ src/lib/krb5/keytab/ktbase.c | 7 +- 3 files changed, 301 insertions(+), 1 deletion(-) create mode 100644 src/lib/krb5/keytab/kt_any.c diff --git a/krb5-1.12.1-pam.patch b/krb5-1.12.1-pam.patch index 9a6a092..ba4382a 100644 --- a/krb5-1.12.1-pam.patch +++ b/krb5-1.12.1-pam.patch @@ -17,11 +17,11 @@ Originally RT#5939, though it's changed since then to perform the account and session management before dropping privileges, and to apply on top of changes we're proposing for how it handles cache collections. --- - src/aclocal.m4 | 67 ++++++++ + src/aclocal.m4 | 67 +++++++ src/clients/ksu/Makefile.in | 8 +- - src/clients/ksu/main.c | 88 +++++++++- - src/clients/ksu/pam.c | 389 ++++++++++++++++++++++++++++++++++++++++++++ - src/clients/ksu/pam.h | 57 +++++++ + src/clients/ksu/main.c | 88 +++++++- + src/clients/ksu/pam.c | 389 ++++++++++++++++++++++++++++++++++++ + src/clients/ksu/pam.h | 57 ++++++ src/configure.in | 2 + 6 files changed, 608 insertions(+), 3 deletions(-) create mode 100644 src/clients/ksu/pam.c diff --git a/krb5-1.13-dirsrv-accountlock.patch b/krb5-1.13-dirsrv-accountlock.patch index db7ca29..e898d9d 100644 --- a/krb5-1.13-dirsrv-accountlock.patch +++ b/krb5-1.13-dirsrv-accountlock.patch @@ -6,9 +6,9 @@ Subject: [PATCH] krb5-1.13-dirsrv-accountlock.patch Treat 'nsAccountLock: true' the same as 'loginDisabled: true'. Updated from original version filed as RT#5891. --- - src/aclocal.m4 | 9 +++++++++ - src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c | 17 +++++++++++++++++ - src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c | 3 +++ + src/aclocal.m4 | 9 +++++++++ + src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c | 17 +++++++++++++++++ + .../kdb/ldap/libkdb_ldap/ldap_principal.c | 3 +++ 3 files changed, 29 insertions(+) diff --git a/src/aclocal.m4 b/src/aclocal.m4 diff --git a/krb5-1.15.1-selinux-label.patch b/krb5-1.15.1-selinux-label.patch index 8d4d1db..8c9a252 100644 --- a/krb5-1.15.1-selinux-label.patch +++ b/krb5-1.15.1-selinux-label.patch @@ -36,31 +36,31 @@ The selabel APIs for looking up the context should be thread-safe (per Red Hat #273081), so switching to using them instead of matchpathcon(), which we used earlier, is some improvement. --- - src/aclocal.m4 | 49 +++ - src/build-tools/krb5-config.in | 3 +- - src/config/pre.in | 3 +- - src/configure.in | 2 + - src/include/k5-int.h | 1 + - src/include/k5-label.h | 32 ++ - src/include/krb5/krb5.hin | 6 + - src/kadmin/dbutil/dump.c | 11 +- - src/kdc/main.c | 2 +- - src/lib/kadm5/logger.c | 4 +- - src/lib/kdb/kdb_log.c | 2 +- - src/lib/krb5/ccache/cc_dir.c | 26 +- - src/lib/krb5/keytab/kt_file.c | 4 +- - src/lib/krb5/os/trace.c | 2 +- - src/lib/krb5/rcache/rc_dfl.c | 13 + - src/plugins/kdb/db2/adb_openclose.c | 2 +- - src/plugins/kdb/db2/kdb_db2.c | 4 +- - src/plugins/kdb/db2/libdb2/btree/bt_open.c | 3 +- - src/plugins/kdb/db2/libdb2/hash/hash.c | 3 +- - src/plugins/kdb/db2/libdb2/recno/rec_open.c | 4 +- - .../kdb/ldap/ldap_util/kdb5_ldap_services.c | 11 +- - src/slave/kpropd.c | 9 + - src/util/profile/prof_file.c | 3 +- - src/util/support/Makefile.in | 3 +- - src/util/support/selinux.c | 406 +++++++++++++++++++++ + src/aclocal.m4 | 49 +++ + src/build-tools/krb5-config.in | 3 +- + src/config/pre.in | 3 +- + src/configure.in | 2 + + src/include/k5-int.h | 1 + + src/include/k5-label.h | 32 ++ + src/include/krb5/krb5.hin | 6 + + src/kadmin/dbutil/dump.c | 11 +- + src/kdc/main.c | 2 +- + src/lib/kadm5/logger.c | 4 +- + src/lib/kdb/kdb_log.c | 2 +- + src/lib/krb5/ccache/cc_dir.c | 26 +- + src/lib/krb5/keytab/kt_file.c | 4 +- + src/lib/krb5/os/trace.c | 2 +- + src/lib/krb5/rcache/rc_dfl.c | 13 + + src/plugins/kdb/db2/adb_openclose.c | 2 +- + src/plugins/kdb/db2/kdb_db2.c | 4 +- + src/plugins/kdb/db2/libdb2/btree/bt_open.c | 3 +- + src/plugins/kdb/db2/libdb2/hash/hash.c | 3 +- + src/plugins/kdb/db2/libdb2/recno/rec_open.c | 4 +- + .../kdb/ldap/ldap_util/kdb5_ldap_services.c | 11 +- + src/slave/kpropd.c | 9 + + src/util/profile/prof_file.c | 3 +- + src/util/support/Makefile.in | 3 +- + src/util/support/selinux.c | 406 ++++++++++++++++++ 25 files changed, 587 insertions(+), 21 deletions(-) create mode 100644 src/include/k5-label.h create mode 100644 src/util/support/selinux.c