Supply static ordinals for new symbols in gssapi32.def and krb5_32.def,
authorGreg Hudson <ghudson@mit.edu>
Fri, 26 Nov 2010 16:37:14 +0000 (16:37 +0000)
committerGreg Hudson <ghudson@mit.edu>
Fri, 26 Nov 2010 16:37:14 +0000 (16:37 +0000)
for consistency with KFW 3.x.

ticket: 6826

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24535 dc483132-0cff-0310-8789-dd5450dbe970

src/lib/gssapi32.def
src/lib/krb5_32.def

index 96dbae42163008b3c56065f07d330cba63d779f9..7c71fa53fb1bdcb5ec973f34521ed34bf5c08fd4 100644 (file)
@@ -99,72 +99,72 @@ EXPORTS
        gss_mech_krb5_wrong             @41     DATA    
 
 ; Added in krb5 1.7-1.9
-       gss_acquire_cred_impersonate_name
-       gss_acquire_cred_with_password
-       gss_add_buffer_set_member
-       gss_add_cred_impersonate_name
-       gss_complete_auth_token
-       gss_create_empty_buffer_set
-       gss_delete_name_attribute
-       gss_display_mech_attr
-       gss_display_name_ext
-       gss_export_name_composite
-       gss_get_name_attribute
-       gss_indicate_mechs_by_attrs
-       gss_inquire_attrs_for_mech
-       gss_inquire_cred_by_oid
-       gss_inquire_mech_for_saslname
-       gss_inquire_name
-       gss_inquire_saslname_for_mech
-       gss_inquire_sec_context_by_oid
-       gsskrb5_extract_authtime_from_sec_context
-       gsskrb5_extract_authz_data_from_sec_context
-       gss_krb5_import_cred
-       gss_krb5_set_cred_rcache
-       gss_map_name_to_any
-       gss_pseudo_random
-       gss_release_any_name_mapping
-       gss_release_buffer_set
-       gss_release_iov_buffer
-       gss_set_cred_option
-       gss_set_name_attribute
-       gss_set_neg_mechs
-       gss_set_sec_context_option
-       gss_store_cred
-       gss_unwrap_aead
-       gss_unwrap_iov
-       gss_wrap_aead
-       gss_wrap_iov
-       gss_wrap_iov_length
+       gss_acquire_cred_impersonate_name               @70
+       gss_acquire_cred_with_password                  @71
+       gss_add_buffer_set_member                       @72
+       gss_add_cred_impersonate_name                   @73
+       gss_complete_auth_token                         @74
+       gss_create_empty_buffer_set                     @75
+       gss_delete_name_attribute                       @76
+       gss_display_mech_attr                           @77
+       gss_display_name_ext                            @78
+       gss_export_name_composite                       @79
+       gss_get_name_attribute                          @80
+       gss_indicate_mechs_by_attrs                     @81
+       gss_inquire_attrs_for_mech                      @82
+       gss_inquire_cred_by_oid                         @83
+       gss_inquire_mech_for_saslname                   @84
+       gss_inquire_name                                @85
+       gss_inquire_saslname_for_mech                   @86
+       gss_inquire_sec_context_by_oid                  @87
+       gsskrb5_extract_authtime_from_sec_context       @88
+       gsskrb5_extract_authz_data_from_sec_context     @89
+       gss_krb5_import_cred                            @90
+       gss_krb5_set_cred_rcache                        @91
+       gss_map_name_to_any                             @92
+       gss_pseudo_random                               @93
+       gss_release_any_name_mapping                    @94
+       gss_release_buffer_set                          @95
+       gss_release_iov_buffer                          @96
+       gss_set_cred_option                             @97
+       gss_set_name_attribute                          @98
+       gss_set_neg_mechs                               @99
+       gss_set_sec_context_option                      @100
+       gss_store_cred                                  @101
+       gss_unwrap_aead                                 @102
+       gss_unwrap_iov                                  @103
+       gss_wrap_aead                                   @104
+       gss_wrap_iov                                    @105
+       gss_wrap_iov_length                             @106
 
-       GSS_C_INQ_SSPI_SESSION_KEY              DATA
-       GSS_C_MA_AUTH_INIT                      DATA
-       GSS_C_MA_AUTH_INIT_ANON                 DATA
-       GSS_C_MA_AUTH_INIT_INIT                 DATA
-       GSS_C_MA_AUTH_TARG                      DATA
-       GSS_C_MA_AUTH_TARG_ANON                 DATA
-       GSS_C_MA_AUTH_TARG_INIT                 DATA
-       GSS_C_MA_CBINDINGS                      DATA
-       GSS_C_MA_COMPRESS                       DATA
-       GSS_C_MA_CONF_PROT                      DATA
-       GSS_C_MA_CTX_TRANS                      DATA
-       GSS_C_MA_DELEG_CRED                     DATA
-       GSS_C_MA_DEPRECATED                     DATA
-       GSS_C_MA_INTEG_PROT                     DATA
-       GSS_C_MA_ITOK_FRAMED                    DATA
-       GSS_C_MA_MECH_COMPOSITE                 DATA
-       GSS_C_MA_MECH_CONCRETE                  DATA
-       GSS_C_MA_MECH_GLUE                      DATA
-       GSS_C_MA_MECH_NEGO                      DATA
-       GSS_C_MA_MECH_PSEUDO                    DATA
-       GSS_C_MA_MIC                            DATA
-       GSS_C_MA_NOT_DFLT_MECH                  DATA
-       GSS_C_MA_NOT_MECH                       DATA
-       GSS_C_MA_OOS_DET                        DATA
-       GSS_C_MA_PFS                            DATA
-       GSS_C_MA_PROT_READY                     DATA
-       GSS_C_MA_REPLAY_DET                     DATA
-       GSS_C_MA_WRAP                           DATA
-       gss_mech_iakerb                         DATA
-       gss_nt_exported_name                    DATA
-       gss_nt_service_name_v2                  DATA
+       GSS_C_INQ_SSPI_SESSION_KEY                      @107    DATA
+       GSS_C_MA_AUTH_INIT                              @108    DATA
+       GSS_C_MA_AUTH_INIT_ANON                         @109    DATA
+       GSS_C_MA_AUTH_INIT_INIT                         @110    DATA
+       GSS_C_MA_AUTH_TARG                              @111    DATA
+       GSS_C_MA_AUTH_TARG_ANON                         @112    DATA
+       GSS_C_MA_AUTH_TARG_INIT                         @113    DATA
+       GSS_C_MA_CBINDINGS                              @114    DATA
+       GSS_C_MA_COMPRESS                               @115    DATA
+       GSS_C_MA_CONF_PROT                              @116    DATA
+       GSS_C_MA_CTX_TRANS                              @117    DATA
+       GSS_C_MA_DELEG_CRED                             @118    DATA
+       GSS_C_MA_DEPRECATED                             @119    DATA
+       GSS_C_MA_INTEG_PROT                             @120    DATA
+       GSS_C_MA_ITOK_FRAMED                            @121    DATA
+       GSS_C_MA_MECH_COMPOSITE                         @122    DATA
+       GSS_C_MA_MECH_CONCRETE                          @123    DATA
+       GSS_C_MA_MECH_GLUE                              @124    DATA
+       GSS_C_MA_MECH_NEGO                              @125    DATA
+       GSS_C_MA_MECH_PSEUDO                            @126    DATA
+       GSS_C_MA_MIC                                    @127    DATA
+       GSS_C_MA_NOT_DFLT_MECH                          @128    DATA
+       GSS_C_MA_NOT_MECH                               @129    DATA
+       GSS_C_MA_OOS_DET                                @130    DATA
+       GSS_C_MA_PFS                                    @131    DATA
+       GSS_C_MA_PROT_READY                             @132    DATA
+       GSS_C_MA_REPLAY_DET                             @133    DATA
+       GSS_C_MA_WRAP                                   @134    DATA
+       gss_mech_iakerb                                 @135    DATA
+       gss_nt_exported_name                            @136    DATA
+       gss_nt_service_name_v2                          @137    DATA
index a7e236e25a83f13fe74c409726ac8a20ac5bd2fa..e74943700cead4a63b648912521c05070d519dd9 100644 (file)
@@ -289,119 +289,119 @@ EXPORTS
        krb5_clear_error_message                @94
 
 ; new in 1.7-1.9
-       krb5_rd_rep_dce
-       krb5_mk_rep_dce
-       krb5_c_padding_length
-       krb5_c_crypto_length
-       krb5_c_encrypt_iov
-       krb5_c_decrypt_iov
-       krb5_c_make_checksum_iov
-       krb5_c_verify_checksum_iov
-       krb5_allow_weak_crypto
-       krb5_anonymous_principal
-       krb5_anonymous_realm
-       krb5_auth_con_getkey_k
-       krb5_auth_con_getrecvsubkey_k
-       krb5_auth_con_getsendsubkey_k
-       krb5_auth_con_setrecvsubkey_k
-       krb5_auth_con_setsendsubkey_k
-       krb5_build_principal_alloc_va
-       krb5_c_crypto_length_iov
-       krb5_c_free_state
-       krb5_c_fx_cf2_simple
-       krb5_c_init_state
-       krb5_c_keylengths
-       krb5_c_random_add_entropy
-       krb5_c_random_os_entropy
-       krb5_c_random_to_key
-       krb5_cc_dup
-       krb5_cc_get_config
-       krb5_cc_set_config
-       krb5_copy_error_message
-       krb5_decode_authdata_container
-       krb5_encode_authdata_container
-       krb5_enctype_to_name
-       krb5_get_fallback_host_realm
-       krb5_get_init_creds_opt_get_fast_flags
-       krb5_get_init_creds_opt_set_anonymous
-       krb5_get_init_creds_opt_set_canonicalize
-       krb5_get_init_creds_opt_set_expire_callback
-       krb5_get_init_creds_opt_set_fast_ccache
-       krb5_get_init_creds_opt_set_fast_ccache_name
-       krb5_get_init_creds_opt_set_fast_flags
-       krb5_get_init_creds_opt_set_out_ccache
-       krb5_init_creds_free
-       krb5_init_creds_get
-       krb5_init_creds_get_creds
-       krb5_init_creds_get_error
-       krb5_init_creds_get_times
-       krb5_init_creds_init
-       krb5_init_creds_set_keytab
-       krb5_init_creds_set_password
-       krb5_init_creds_set_service
-       krb5_init_creds_step
-       krb5_is_config_principal
-       krb5_k_create_key
-       krb5_k_decrypt
-       krb5_k_decrypt_iov
-       krb5_k_encrypt
-       krb5_k_encrypt_iov
-       krb5_k_free_key
-       krb5_k_key_enctype
-       krb5_k_key_keyblock
-       krb5_k_make_checksum
-       krb5_k_make_checksum_iov
-       krb5_k_prf
-       krb5_k_reference_key
-       krb5_k_verify_checksum
-       krb5_k_verify_checksum_iov
-       krb5_make_authdata_kdc_issued
-       krb5_merge_authdata
-       krb5_pac_add_buffer
-       krb5_pac_free
-       krb5_pac_get_buffer
-       krb5_pac_get_types
-       krb5_pac_init
-       krb5_pac_parse
-       krb5_pac_verify
-       krb5_parse_name_flags
-       krb5_principal_compare_any_realm
-       krb5_principal_compare_flags
-       krb5_tkt_creds_free
-       krb5_tkt_creds_get
-       krb5_tkt_creds_get_creds
-       krb5_tkt_creds_get_times
-       krb5_tkt_creds_init
-       krb5_tkt_creds_step
-       krb5_unparse_name_flags
-       krb5_unparse_name_flags_ext
-       krb5_verify_authdata_kdc_issued
+       krb5_rd_rep_dce                                 @270
+       krb5_mk_rep_dce                                 @271
+       krb5_c_padding_length                           @272
+       krb5_c_crypto_length                            @273
+       krb5_c_encrypt_iov                              @274
+       krb5_c_decrypt_iov                              @275
+       krb5_c_make_checksum_iov                        @276
+       krb5_c_verify_checksum_iov                      @277
+       krb5_allow_weak_crypto                          @278
+       krb5_anonymous_principal                        @279
+       krb5_anonymous_realm                            @280
+       krb5_auth_con_getkey_k                          @281
+       krb5_auth_con_getrecvsubkey_k                   @282
+       krb5_auth_con_getsendsubkey_k                   @283
+       krb5_auth_con_setrecvsubkey_k                   @284
+       krb5_auth_con_setsendsubkey_k                   @285
+       krb5_build_principal_alloc_va                   @286
+       krb5_c_crypto_length_iov                        @287
+       krb5_c_free_state                               @288
+       krb5_c_fx_cf2_simple                            @289
+       krb5_c_init_state                               @290
+       krb5_c_keylengths                               @291
+       krb5_c_random_add_entropy                       @292
+       krb5_c_random_os_entropy                        @293
+       krb5_c_random_to_key                            @294
+       krb5_cc_dup                                     @295
+       krb5_cc_get_config                              @296
+       krb5_cc_set_config                              @297
+       krb5_copy_error_message                         @298
+       krb5_decode_authdata_container                  @299
+       krb5_encode_authdata_container                  @300
+       krb5_enctype_to_name                            @301
+       krb5_get_fallback_host_realm                    @302
+       krb5_get_init_creds_opt_get_fast_flags          @303
+       krb5_get_init_creds_opt_set_anonymous           @304
+       krb5_get_init_creds_opt_set_canonicalize        @305
+       krb5_get_init_creds_opt_set_expire_callback     @306
+       krb5_get_init_creds_opt_set_fast_ccache         @307
+       krb5_get_init_creds_opt_set_fast_ccache_name    @308
+       krb5_get_init_creds_opt_set_fast_flags          @309
+       krb5_get_init_creds_opt_set_out_ccache          @310
+       krb5_init_creds_free                            @311
+       krb5_init_creds_get                             @312
+       krb5_init_creds_get_creds                       @313
+       krb5_init_creds_get_error                       @314
+       krb5_init_creds_get_times                       @315
+       krb5_init_creds_init                            @316
+       krb5_init_creds_set_keytab                      @317
+       krb5_init_creds_set_password                    @318
+       krb5_init_creds_set_service                     @319
+       krb5_init_creds_step                            @320
+       krb5_is_config_principal                        @321
+       krb5_k_create_key                               @322
+       krb5_k_decrypt                                  @323
+       krb5_k_decrypt_iov                              @324
+       krb5_k_encrypt                                  @325
+       krb5_k_encrypt_iov                              @326
+       krb5_k_free_key                                 @327
+       krb5_k_key_enctype                              @328
+       krb5_k_key_keyblock                             @329
+       krb5_k_make_checksum                            @330
+       krb5_k_make_checksum_iov                        @331
+       krb5_k_prf                                      @332
+       krb5_k_reference_key                            @333
+       krb5_k_verify_checksum                          @334
+       krb5_k_verify_checksum_iov                      @335
+       krb5_make_authdata_kdc_issued                   @336
+       krb5_merge_authdata                             @337
+       krb5_pac_add_buffer                             @338
+       krb5_pac_free                                   @339
+       krb5_pac_get_buffer                             @340
+       krb5_pac_get_types                              @341
+       krb5_pac_init                                   @342
+       krb5_pac_parse                                  @343
+       krb5_pac_verify                                 @344
+       krb5_parse_name_flags                           @345
+       krb5_principal_compare_any_realm                @346
+       krb5_principal_compare_flags                    @347
+       krb5_tkt_creds_free                             @348
+       krb5_tkt_creds_get                              @349
+       krb5_tkt_creds_get_creds                        @350
+       krb5_tkt_creds_get_times                        @351
+       krb5_tkt_creds_init                             @352
+       krb5_tkt_creds_step                             @353
+       krb5_unparse_name_flags                         @354
+       krb5_unparse_name_flags_ext                     @355
+       krb5_verify_authdata_kdc_issued                 @356
 
 ; More internal symbols used by gssapi
-       decode_krb5_error                               ; PRIVATE GSSAPI
-       decode_krb5_iakerb_finished                     ; PRIVATE GSSAPI
-       decode_krb5_iakerb_header                       ; PRIVATE GSSAPI
-       encode_krb5_iakerb_finished                     ; PRIVATE GSSAPI
-       encode_krb5_iakerb_header                       ; PRIVATE GSSAPI
-       encode_krb5_ticket                              ; PRIVATE GSSAPI
-       krb5_auth_con_get_authdata_context              ; PRIVATE GSSAPI
-       krb5_auth_con_set_authdata_context              ; PRIVATE GSSAPI
-       krb5_authdata_context_copy                      ; PRIVATE GSSAPI
-       krb5_authdata_context_free                      ; PRIVATE GSSAPI
-       krb5_authdata_context_init                      ; PRIVATE GSSAPI
-       krb5_authdata_delete_attribute                  ; PRIVATE GSSAPI
-       krb5_authdata_export_attributes                 ; PRIVATE GSSAPI
-       krb5_authdata_export_authdata                   ; PRIVATE GSSAPI
-       krb5_authdata_export_internal                   ; PRIVATE GSSAPI
-       krb5_authdata_free_internal                     ; PRIVATE GSSAPI
-       krb5_authdata_get_attribute                     ; PRIVATE GSSAPI
-       krb5_authdata_get_attribute_types               ; PRIVATE GSSAPI
-       krb5_authdata_import_attributes                 ; PRIVATE GSSAPI
-       krb5_authdata_set_attribute                     ; PRIVATE GSSAPI
-       krb5_free_iakerb_finished                       ; PRIVATE GSSAPI
-       krb5_free_iakerb_header                         ; PRIVATE GSSAPI
-       krb5_get_credentials_for_user                   ; PRIVATE GSSAPI
-       krb5_get_credentials_for_proxy                  ; PRIVATE GSSAPI
-       krb5_sendto_kdc                                 ; PRIVATE GSSAPI
-       krb5int_copy_data_contents_add0                 ; PRIVATE GSSAPI
-       krb5int_free_data_list                          ; PRIVATE GSSAPI
+       decode_krb5_error                               @357 ; PRIVATE GSSAPI
+       decode_krb5_iakerb_finished                     @358 ; PRIVATE GSSAPI
+       decode_krb5_iakerb_header                       @359 ; PRIVATE GSSAPI
+       encode_krb5_iakerb_finished                     @360 ; PRIVATE GSSAPI
+       encode_krb5_iakerb_header                       @361 ; PRIVATE GSSAPI
+       encode_krb5_ticket                              @362 ; PRIVATE GSSAPI
+       krb5_auth_con_get_authdata_context              @363 ; PRIVATE GSSAPI
+       krb5_auth_con_set_authdata_context              @364 ; PRIVATE GSSAPI
+       krb5_authdata_context_copy                      @365 ; PRIVATE GSSAPI
+       krb5_authdata_context_free                      @366 ; PRIVATE GSSAPI
+       krb5_authdata_context_init                      @367 ; PRIVATE GSSAPI
+       krb5_authdata_delete_attribute                  @368 ; PRIVATE GSSAPI
+       krb5_authdata_export_attributes                 @369 ; PRIVATE GSSAPI
+       krb5_authdata_export_authdata                   @370 ; PRIVATE GSSAPI
+       krb5_authdata_export_internal                   @371 ; PRIVATE GSSAPI
+       krb5_authdata_free_internal                     @372 ; PRIVATE GSSAPI
+       krb5_authdata_get_attribute                     @373 ; PRIVATE GSSAPI
+       krb5_authdata_get_attribute_types               @374 ; PRIVATE GSSAPI
+       krb5_authdata_import_attributes                 @375 ; PRIVATE GSSAPI
+       krb5_authdata_set_attribute                     @376 ; PRIVATE GSSAPI
+       krb5_free_iakerb_finished                       @377 ; PRIVATE GSSAPI
+       krb5_free_iakerb_header                         @378 ; PRIVATE GSSAPI
+       krb5_get_credentials_for_user                   @379 ; PRIVATE GSSAPI
+       krb5_get_credentials_for_proxy                  @380 ; PRIVATE GSSAPI
+       krb5_sendto_kdc                                 @381 ; PRIVATE GSSAPI
+       krb5int_copy_data_contents_add0                 @382 ; PRIVATE GSSAPI
+       krb5int_free_data_list                          @383 ; PRIVATE GSSAPI