diff options
| author | Zhanna Tsitkov <tsitkova@mit.edu> | 2012-08-23 16:14:53 -0400 |
|---|---|---|
| committer | Zhanna Tsitkov <tsitkova@mit.edu> | 2012-08-23 16:31:31 -0400 |
| commit | 979d765e0635611fe183a4690b656f3d816939e3 (patch) | |
| tree | ac22f97678eea5cf2207907a086ae38927220098 | |
| parent | 3152a4c79e34b1954616a39e24c7d179cd08e0bb (diff) | |
| download | krb5-979d765e0635611fe183a4690b656f3d816939e3.tar.gz krb5-979d765e0635611fe183a4690b656f3d816939e3.tar.xz krb5-979d765e0635611fe183a4690b656f3d816939e3.zip | |
Doc newly introduced padata types for OTP support
Remove KRB5_PADATA_OTP_CONFIRM pre-authentication data (padata) type
as it is marked as OBSOLETE in RFC 6560.
| -rw-r--r-- | doc/rst_source/krb_appldev/refs/macros/index.rst | 4 | ||||
| -rw-r--r-- | src/include/krb5/krb5.hin | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/doc/rst_source/krb_appldev/refs/macros/index.rst b/doc/rst_source/krb_appldev/refs/macros/index.rst index 2d64f8bbb0..b265810596 100644 --- a/doc/rst_source/krb_appldev/refs/macros/index.rst +++ b/doc/rst_source/krb_appldev/refs/macros/index.rst @@ -170,6 +170,7 @@ Public KRB5_KEYUSAGE_KRB_ERROR_CKSUM.rst KRB5_KEYUSAGE_KRB_PRIV_ENCPART.rst KRB5_KEYUSAGE_KRB_SAFE_CKSUM.rst + KRB5_KEYUSAGE_PA_OTP_REQUEST.rst KRB5_KEYUSAGE_PA_PKINIT_KX.rst KRB5_KEYUSAGE_PA_REFERRAL.rst KRB5_KEYUSAGE_PA_S4U_X509_USER_REPLY.rst @@ -242,6 +243,9 @@ Public KRB5_PADATA_GET_FROM_TYPED_DATA.rst KRB5_PADATA_NONE.rst KRB5_PADATA_OSF_DCE.rst + KRB5_PADATA_OTP_CHALLENGE.rst + KRB5_PADATA_OTP_PIN_CHANGE.rst + KRB5_PADATA_OTP_REQUEST.rst KRB5_PADATA_PAC_REQUEST.rst KRB5_PADATA_PKINIT_KX.rst KRB5_PADATA_PK_AS_REP.rst diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin index 16da726663..2f3974a129 100644 --- a/src/include/krb5/krb5.hin +++ b/src/include/krb5/krb5.hin @@ -970,7 +970,7 @@ krb5_c_keyed_checksum_types(krb5_context context, krb5_enctype enctype, #define KRB5_KEYUSAGE_AD_SIGNEDPATH -21 #define KRB5_KEYUSAGE_IAKERB_FINISHED 42 #define KRB5_KEYUSAGE_PA_PKINIT_KX 44 -#define KRB5_KEYUSAGE_PA_OTP_REQUEST 45 +#define KRB5_KEYUSAGE_PA_OTP_REQUEST 45 /**< See RFC 6560 section 4.2 */ /* define in draft-ietf-krb-wg-preauth-framework*/ #define KRB5_KEYUSAGE_FAST_REQ_CHKSUM 50 #define KRB5_KEYUSAGE_FAST_ENC 51 @@ -1813,12 +1813,11 @@ krb5_verify_checksum(krb5_context context, krb5_cksumtype ctype, #define KRB5_PADATA_FX_FAST 136 #define KRB5_PADATA_FX_ERROR 137 #define KRB5_PADATA_ENCRYPTED_CHALLENGE 138 -#define KRB5_PADATA_OTP_CHALLENGE 141 -#define KRB5_PADATA_OTP_REQUEST 142 -#define KRB5_PADATA_OTP_CONFIRM 143 -#define KRB5_PADATA_OTP_PIN_CHANGE 144 -#define KRB5_PADATA_PKINIT_KX 147 -#define KRB5_ENCPADATA_REQ_ENC_PA_REP 149 +#define KRB5_PADATA_OTP_CHALLENGE 141 /**< See RFC 6560 section 4.1 */ +#define KRB5_PADATA_OTP_REQUEST 142 /**< See RFC 6560 section 4.2 */ +#define KRB5_PADATA_OTP_PIN_CHANGE 144 /**< See RFC 6560 section 4.3 */ +#define KRB5_PADATA_PKINIT_KX 147 +#define KRB5_ENCPADATA_REQ_ENC_PA_REP 149 #define KRB5_SAM_USE_SAD_AS_KEY 0x80000000 #define KRB5_SAM_SEND_ENCRYPTED_SAD 0x40000000 |