summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mac/K5Library.exp38
-rw-r--r--src/mac/Makefile.tmpl27
-rw-r--r--src/mac/krb5.ini2
3 files changed, 47 insertions, 20 deletions
diff --git a/src/mac/K5Library.exp b/src/mac/K5Library.exp
index 716a51958..c3e1093ec 100644
--- a/src/mac/K5Library.exp
+++ b/src/mac/K5Library.exp
@@ -53,6 +53,8 @@
krb5_free_ticket
krb5_free_tickets
krb5_free_tkt_authent
+ krb5_free_checksum_contents
+ krb5_free_cksumtypes
krb5_fwd_tgt_creds
krb5_get_credentials
krb5_get_credentials_renew
@@ -118,6 +120,16 @@
krb5_finish_random_key
krb5_random_key
#
+ krb5_c_decrypt
+ krb5_c_encrypt
+ krb5_c_encrypt_length
+ krb5_c_checksum_length
+ krb5_c_block_size
+ krb5_c_make_checksum
+ krb5_c_verify_checksum
+ krb5_c_random_make_octets
+ krb5_c_keyed_checksum_types
+#
krb5_425_conv_principal
krb5_524_conv_principal
#
@@ -140,6 +152,7 @@
krb5_auth_con_getlocalsubkey
krb5_auth_con_getremotesubkey
krb5_auth_con_init
+ krb5_auth_con_setaddrs
krb5_auth_con_setflags
krb5_auth_con_getlocalseqnumber
krb5_auth_con_getremoteseqnumber
@@ -160,14 +173,15 @@
krb5_kt_free_entry
krb5_kt_read_service_key
krb5_kt_remove_entry
-#Kadm routines
-# krb5_adm_connect
-# krb5_adm_disconnect
-# krb5_free_adm_data
-# krb5_read_adm_reply
-# krb5_send_adm_cmd
+
#
krb5_change_password
+#
+ krb5_realm_iterator_create
+ krb5_realm_iterator
+ krb5_realm_iterator_free
+ krb5_free_realm_string
+
#Temporary exports (DO NOT USE)
decode_krb5_ticket
profile_get_values
@@ -191,14 +205,4 @@
add_error_table
remove_error_table
error_message
-
-# DES exports
- mit_des_ecb_encrypt
- mit_des_init_random_key
- mit_des_key_sched
- mit_des_random_key
-# mit_des_new_random_key
-# mit_des_pcbc_encrypt
-# mit_des_quad_cksum
-# mit_des_string_to_key
-# mit_des_set_random_generator_seed
+ \ No newline at end of file
diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl
index 23fe70e52..4afe94b8a 100644
--- a/src/mac/Makefile.tmpl
+++ b/src/mac/Makefile.tmpl
@@ -347,9 +347,8 @@ compile-testtrack : {testtrack-obj-cfm68k} {testtrack-obj-ppc}
## Linking
##
################################################################################
-# fixme/ only build PPC for now
# link : link-cfm68k link-ppc link-fat
-
+# link-debug : link-cfm68k-debug link-ppc-debug link-fat-debug
link : link-ppc link-fat
link-debug : link-ppc-debug link-fat-debug
link-all : link link-debug
@@ -489,6 +488,8 @@ GSSLib : GSSLib.PPC Kerberos5Lib.PPC {ccache-ppc} # GSSLib.68K Kerberos5Lib.68K
# MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" GSSLib
MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC" GSSLib
MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" GSSLib
+# MergeFragment "/mac/libraries/DES/bin/deslib.68K" GSSLib
+ MergeFragment "/mac/libraries/DES/bin/deslib.PPC" GSSLib
DeRez -only "'cfrg'(0)" GSSLib "{RIncludes}"CodeFragments.r | StreamEdit -s /mac/FragmentAlias.mpw | Rez -a -o GSSLib -i "{RIncludes}"
@@ -503,9 +504,11 @@ GSSLib.debug : GSSLib.PPC.debug Kerberos5Lib.PPC.debug {ccache-ppc-debug} # GSSL
# MergeFragment "/bin/MIT CLib.68K" GSSLib.debug
# MergeFragment "/bin/MIT RuntimeLib.68K" GSSLib.debug
# MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.68K.debug" GSSLib.debug
-# MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" GSSLib
+# MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" GSSLib.debug
MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC.debug" GSSLib.debug
MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" GSSLib.debug
+# MergeFragment "/mac/libraries/DES/bin/deslib.68K.debug" GSSLib.debug
+ MergeFragment "/mac/libraries/DES/bin/deslib.PPC.debug" GSSLib.debug
DeRez -only "'cfrg'(0)" GSSLib.debug "{RIncludes}"CodeFragments.r | StreamEdit -s /mac/FragmentAlias.mpw | Rez -a -o GSSLib.debug -i "{RIncludes}"
################################################################################
@@ -550,9 +553,11 @@ mac-folders = `perl "/mac/macfile_gen.pl" macdirs`
all-mac-files = {mac-files} {classic-glue-input} {autogeneration-sources} /Makefile.in /patchlevel.h \
/util/et/et_h.perl /util/et/et_c.perl \
/mac/GSS.CFM.c \
+ /mac/GSS.CFMglue.h \
/mac/GSSLibrary.exp \
/mac/GSSLibrary.SAP.exp \
/mac/K5.CFM.c \
+ /mac/K5.CFMglue.h \
/mac/K5Library.exp \
/mac/krb5.ini \
/mac/macfile_gen.pl \
@@ -592,6 +597,18 @@ all-mac-files = {mac-files} {classic-glue-input} {autogeneration-sources} /Makef
"/mac/libraries/CCache API/bin/CCacheLib.PPC.debug" \
"/mac/libraries/CCache API/bin/CCacheLib.68K" \
"/mac/libraries/CCache API/bin/CCacheLib.PPC" \
+ /mac/libraries/DES/bin/deslib.68K \
+ /mac/libraries/DES/bin/deslib.68K.debug \
+ /mac/libraries/DES/bin/deslib.PPC \
+ /mac/libraries/DES/bin/deslib.PPC.debug \
+ /mac/libraries/DES/doc/ChangeLog \
+ /mac/libraries/DES/doc/f_README \
+ /mac/libraries/DES/doc/READ_ME \
+ /mac/libraries/DES/doc/ren.msg \
+ /mac/libraries/DES/include/des.h \
+ /mac/libraries/DES/include/deslib.CFMGlue.c \
+ /mac/libraries/DES/include/deslib.CFMGlue.h \
+ /mac/libraries/DES/include/mit-copyright.h \
/mac/TestTrack/ChangeLog \
/mac/TestTrack/GSSforSAP.r \
/mac/TestTrack/MITAthenaLib \
@@ -612,6 +629,10 @@ all-mac-folders = /config/ /include/ /include/krb5/ /include/krb5/stock/ \
"/mac/libraries/CCache API/" \
"/mac/libraries/CCache API/bin" \
"/mac/libraries/CCache API/include" \
+ /mac/libraries/DES/ \
+ /mac/libraries/DES/bin \
+ /mac/libraries/DES/doc \
+ /mac/libraries/DES/include \
/mac/testtrack/
snapshot : autogenerate-clean
diff --git a/src/mac/krb5.ini b/src/mac/krb5.ini
index 417c6c476..5c79aa32b 100644
--- a/src/mac/krb5.ini
+++ b/src/mac/krb5.ini
@@ -7,6 +7,8 @@
[libdefaults]
default_realm = ATHENA.MIT.EDU
ticket_lifetime = 600
+ default_tkt_enctypes = des-cbc-crc
+ default_tgs_enctypes = des-cbc-crc
[realms]
ATHENA.MIT.EDU = {