jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 23:40:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

crypto: Fixes for recent Heimdal changes

Browse Source 
ignore KRB5_DEPRECATED_FUNCTIONS for now since it doesnt give any
advice.  Some keytypes (but not all) have been renamed.  So for
now we need to keep both apparently.

Change-Id: I55de284448d255d5107afe03b4df56ccebc90beb
Reviewed-on: http://gerrit.openafs.org/5400
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
This commit is contained in:
Chas Williams (CONTRACTOR) 2011-09-12 15:24:39 -04:00 committed by Jeffrey Altman
parent f566228af8
commit df13bb3be2
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/crypto/rfc3961/krb5_locl.h
View File

@ -88,6 +88,11 @@ typedef enum krb5_keytype {
KEYTYPE_ARCFOUR_56 = 24 KEYTYPE_ARCFOUR_56 = 24
} krb5_keytype; } krb5_keytype;
#define KRB5_ENCTYPE_NULL KEYTYPE_NULL
#define KRB5_ENCTYPE_OLD_DES3_CBC_SHA1 KEYTYPE_DES3
#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 KEYTYPE_AES128
#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 KEYTYPE_AES256
typedef struct krb5_salt { typedef struct krb5_salt {
krb5_salttype salttype; krb5_salttype salttype;
krb5_data saltvalue; krb5_data saltvalue;
@ -161,6 +166,10 @@ int krb5_data_ct_cmp(const krb5_data *, const krb5_data *);
int der_copy_octet_string(const krb5_data *, krb5_data *); int der_copy_octet_string(const krb5_data *, krb5_data *);
int copy_EncryptionKey(const krb5_keyblock *, krb5_keyblock *); int copy_EncryptionKey(const krb5_keyblock *, krb5_keyblock *);
int ct_memcmp(const void *p1, const void *p2, size_t len); int ct_memcmp(const void *p1, const void *p2, size_t len);
krb5_error_code krb5_enctype_to_string(krb5_context context,
krb5_enctype etype,
char **string);
#include "crypto.h" #include "crypto.h"

2
src/util/krb5_locl.h
View File

@ -31,6 +31,8 @@
#define KRB5_LIB_FUNCTION static AFS_UNUSED #define KRB5_LIB_FUNCTION static AFS_UNUSED
#define KRB5_LIB_CALL #define KRB5_LIB_CALL
#define KRB5_DEPRECATED_FUNCTION(x)
/* This value shouldn't be hard coded */ /* This value shouldn't be hard coded */
#define KRB5_CONFIG_BADFORMAT (-1765328248L) #define KRB5_CONFIG_BADFORMAT (-1765328248L)