diff options
| author | Matt Caswell <matt@openssl.org> | 2015-05-12 12:14:13 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-05-13 15:08:10 +0100 |
| commit | e36827f6d10ed64abb1b374b6f11b79225d04205 (patch) | |
| tree | 43f81b81c0ba112dd6e5d231ec50e5c1e9806a18 /util | |
| parent | 60b3d36df3625fad66b53ccc32dc31818cf3048e (diff) | |
Remove remaining Kerberos references
Following on from the removal of libcrypto and libssl support for Kerberos
this commit removes all remaining references to Kerberos.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/clean-depend.pl | 2 | ||||
| -rwxr-xr-x | util/domd | 4 | ||||
| -rw-r--r-- | util/indent.pro | 31 | ||||
| -rwxr-xr-x | util/libeay.num | 132 | ||||
| -rwxr-xr-x | util/mk1mf.pl | 25 | ||||
| -rwxr-xr-x | util/mkdef.pl | 7 | ||||
| -rwxr-xr-x | util/mkfiles.pl | 1 |
7 files changed, 68 insertions, 134 deletions
diff --git a/util/clean-depend.pl b/util/clean-depend.pl index d3525b0ed0..04d86b6d09 100755 --- a/util/clean-depend.pl +++ b/util/clean-depend.pl @@ -23,8 +23,6 @@ while(<STDIN>) { @deps=grep(!/^\//,@deps); @deps=grep(!/^\\$/,@deps); @deps=grep(!/^$origfile$/,@deps); -# pull out the kludged kerberos header (if present). - @deps=grep(!/^[.\/]+\/krb5.h/,@deps); push @{$files{$thisfile}},@deps; } @@ -12,8 +12,6 @@ fi if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi cp Makefile Makefile.save -# fake the presence of Kerberos -touch $TOP/krb5.h if expr "$MAKEDEPEND" : '.*cc' > /dev/null; then args="" while [ $# -gt 0 ]; do @@ -32,7 +30,5 @@ else RC=$? fi mv Makefile.new Makefile -# unfake the presence of Kerberos -rm $TOP/krb5.h exit $RC diff --git a/util/indent.pro b/util/indent.pro index 2a7c1b7b44..5a6d452924 100644 --- a/util/indent.pro +++ b/util/indent.pro @@ -305,14 +305,6 @@ -T JPAKE_STEP_PART -T JPAKE_ZKP -T KEY_TABLE_TYPE --T KRB5_APREQBODY --T KRB5_AUTHDATA --T KRB5_AUTHENTBODY --T KRB5_CHECKSUM --T KRB5_ENCDATA --T KRB5_ENCKEY --T KRB5_PRINCNAME --T KRB5_TKTBODY -T LHASH -T LHASH_COMP_FN_TYPE -T LHASH_DOALL_ARG_FN_TYPE @@ -650,9 +642,6 @@ -T STACK_OF_GENERAL_SUBTREE_ -T STACK_OF_IPAddressFamily_ -T STACK_OF_IPAddressOrRange_ --T STACK_OF_KRB5_APREQBODY_ --T STACK_OF_KRB5_AUTHENTBODY_ --T STACK_OF_KRB5_TKTBODY_ -T STACK_OF_MEM_OBJECT_DATA_ -T STACK_OF_MIME_HEADER_ -T STACK_OF_MIME_PARAM_ @@ -719,26 +708,6 @@ -T clock_t -T custom_ext_methods -T hm_fragment --T krb5_auth_context --T krb5_authdata --T KRB5_CALLCONV --T krb5_ccache --T krb5_context --T krb5_creds --T krb5_data --T krb5_deltat --T krb5_flags --T krb5_int32 --T krb5_keyblock --T krb5_keytab --T krb5_keytab_entry --T krb5_octet --T krb5_principal --T krb5_principal_data --T krb5_rcache --T krb5_ticket --T krb5_ticket_times --T krb5_timestamp -T record_pqueue -T ssl_ctx_st -T ssl_flag_tbl diff --git a/util/libeay.num b/util/libeay.num index b3dcd5d978..d41686fea4 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -1950,8 +1950,8 @@ ASN1_UTF8STRING_it 2527 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI ENGINE_unregister_ciphers 2528 EXIST::FUNCTION:ENGINE ENGINE_get_ciphers 2529 EXIST::FUNCTION:ENGINE d2i_OCSP_BASICRESP 2530 EXIST::FUNCTION: -KRB5_CHECKSUM_it 2531 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -KRB5_CHECKSUM_it 2531 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +KRB5_CHECKSUM_it 2531 NOEXIST::FUNCTION: +KRB5_CHECKSUM_it 2531 NOEXIST::FUNCTION: EC_POINT_add 2532 EXIST::FUNCTION:EC ASN1_item_ex_i2d 2533 EXIST::FUNCTION: OCSP_CERTID_it 2534 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: @@ -1982,8 +1982,8 @@ OCSP_SIGNATURE_it 2554 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI X509_CRL_it 2555 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: X509_CRL_it 2555 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: OCSP_BASICRESP_add_ext 2556 EXIST::FUNCTION: -KRB5_ENCKEY_it 2557 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -KRB5_ENCKEY_it 2557 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +KRB5_ENCKEY_it 2557 NOEXIST::FUNCTION: +KRB5_ENCKEY_it 2557 NOEXIST::FUNCTION: UI_method_set_closer 2558 EXIST::FUNCTION: X509_STORE_set_purpose 2559 EXIST::FUNCTION: i2d_ASN1_GENERALSTRING 2560 EXIST::FUNCTION: @@ -1996,11 +1996,11 @@ _ossl_old_des_random_key 2566 NOEXIST::FUNCTION: ASN1_T61STRING_it 2567 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: ASN1_T61STRING_it 2567 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: EC_GROUP_method_of 2568 EXIST::FUNCTION:EC -i2d_KRB5_APREQ 2569 EXIST::FUNCTION: +i2d_KRB5_APREQ 2569 NOEXIST::FUNCTION: _ossl_old_des_encrypt 2570 NOEXIST::FUNCTION: ASN1_PRINTABLE_new 2571 EXIST::FUNCTION: HMAC_Init_ex 2572 EXIST::FUNCTION: -d2i_KRB5_AUTHENT 2573 EXIST::FUNCTION: +d2i_KRB5_AUTHENT 2573 NOEXIST::FUNCTION: OCSP_archive_cutoff_new 2574 EXIST::FUNCTION: EC_POINT_set_Jprojective_coordinates_GFp 2575 EXIST:!VMS:FUNCTION:EC EC_POINT_set_Jproj_coords_GFp 2575 EXIST:VMS:FUNCTION:EC @@ -2017,11 +2017,11 @@ ENGINE_register_DH 2584 EXIST::FUNCTION:ENGINE UI_construct_prompt 2585 EXIST::FUNCTION: X509_STORE_set_trust 2586 EXIST::FUNCTION: UI_dup_input_string 2587 EXIST::FUNCTION: -d2i_KRB5_APREQ 2588 EXIST::FUNCTION: +d2i_KRB5_APREQ 2588 NOEXIST::FUNCTION: EVP_MD_CTX_copy_ex 2589 EXIST::FUNCTION: OCSP_request_is_signed 2590 EXIST::FUNCTION: i2d_OCSP_REQINFO 2591 EXIST::FUNCTION: -KRB5_ENCKEY_free 2592 EXIST::FUNCTION: +KRB5_ENCKEY_free 2592 NOEXIST::FUNCTION: OCSP_resp_get0 2593 EXIST::FUNCTION: GENERAL_NAME_it 2594 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: GENERAL_NAME_it 2594 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: @@ -2059,10 +2059,10 @@ ENGINE_register_ciphers 2620 EXIST::FUNCTION:ENGINE BN_mod_lshift_quick 2621 EXIST::FUNCTION: DSO_set_filename 2622 EXIST::FUNCTION: ASN1_item_free 2623 EXIST::FUNCTION: -KRB5_TKTBODY_free 2624 EXIST::FUNCTION: +KRB5_TKTBODY_free 2624 NOEXIST::FUNCTION: AUTHORITY_KEYID_it 2625 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: AUTHORITY_KEYID_it 2625 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -KRB5_APREQBODY_new 2626 EXIST::FUNCTION: +KRB5_APREQBODY_new 2626 NOEXIST::FUNCTION: X509V3_EXT_REQ_add_nconf 2627 EXIST::FUNCTION: ENGINE_ctrl_cmd_string 2628 EXIST::FUNCTION:ENGINE i2d_OCSP_RESPDATA 2629 EXIST::FUNCTION: @@ -2071,7 +2071,7 @@ EXTENDED_KEY_USAGE_free 2631 EXIST::FUNCTION: PKCS7_ATTR_SIGN_it 2632 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: PKCS7_ATTR_SIGN_it 2632 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: UI_add_error_string 2633 EXIST::FUNCTION: -KRB5_CHECKSUM_free 2634 EXIST::FUNCTION: +KRB5_CHECKSUM_free 2634 NOEXIST::FUNCTION: OCSP_REQUEST_get_ext 2635 EXIST::FUNCTION: ENGINE_load_ubsec 2636 EXIST::FUNCTION:ENGINE,STATIC_ENGINE ENGINE_register_all_digests 2637 EXIST::FUNCTION:ENGINE @@ -2085,7 +2085,7 @@ X509_REVOKED_it 2642 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA X509_REVOKED_it 2642 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: ASN1_STRING_encode 2643 NOEXIST::FUNCTION: EVP_aes_128_ecb 2644 EXIST::FUNCTION:AES -KRB5_AUTHENT_free 2645 EXIST::FUNCTION: +KRB5_AUTHENT_free 2645 NOEXIST::FUNCTION: OCSP_BASICRESP_get_ext_by_critical 2646 EXIST:!VMS:FUNCTION: OCSP_BASICRESP_get_ext_by_crit 2646 EXIST:VMS:FUNCTION: OCSP_cert_status_str 2647 EXIST::FUNCTION: @@ -2113,7 +2113,7 @@ ENGINE_unregister_DSA 2665 EXIST::FUNCTION:ENGINE _ossl_old_des_key_sched 2666 NOEXIST::FUNCTION: X509_EXTENSION_it 2667 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: X509_EXTENSION_it 2667 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -i2d_KRB5_AUTHENT 2668 EXIST::FUNCTION: +i2d_KRB5_AUTHENT 2668 NOEXIST::FUNCTION: SXNETID_it 2669 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: SXNETID_it 2669 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: d2i_OCSP_SINGLERESP 2670 EXIST::FUNCTION: @@ -2123,7 +2123,7 @@ _ossl_old_des_ofb64_encrypt 2673 NOEXIST::FUNCTION: d2i_EXTENDED_KEY_USAGE 2674 EXIST::FUNCTION: ERR_print_errors_cb 2675 EXIST::FUNCTION: ENGINE_set_ciphers 2676 EXIST::FUNCTION:ENGINE -d2i_KRB5_APREQBODY 2677 EXIST::FUNCTION: +d2i_KRB5_APREQBODY 2677 NOEXIST::FUNCTION: UI_method_get_flusher 2678 EXIST::FUNCTION: X509_PUBKEY_it 2679 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: X509_PUBKEY_it 2679 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: @@ -2133,14 +2133,14 @@ PKCS7_ENCRYPT_it 2681 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI i2d_OCSP_RESPONSE 2682 EXIST::FUNCTION: EC_GROUP_get_cofactor 2683 EXIST::FUNCTION:EC PKCS12_unpack_p7data 2684 EXIST::FUNCTION: -d2i_KRB5_AUTHDATA 2685 EXIST::FUNCTION: +d2i_KRB5_AUTHDATA 2685 NOEXIST::FUNCTION: OCSP_copy_nonce 2686 EXIST::FUNCTION: -KRB5_AUTHDATA_new 2687 EXIST::FUNCTION: +KRB5_AUTHDATA_new 2687 NOEXIST::FUNCTION: OCSP_RESPDATA_new 2688 EXIST::FUNCTION: EC_GFp_mont_method 2689 EXIST::FUNCTION:EC OCSP_REVOKEDINFO_free 2690 EXIST::FUNCTION: UI_get_ex_data 2691 EXIST::FUNCTION: -KRB5_APREQBODY_free 2692 EXIST::FUNCTION: +KRB5_APREQBODY_free 2692 NOEXIST::FUNCTION: EC_GROUP_get0_generator 2693 EXIST::FUNCTION:EC UI_get_default_method 2694 EXIST::FUNCTION: X509V3_set_nconf 2695 EXIST::FUNCTION: @@ -2148,7 +2148,7 @@ PKCS12_item_i2d_encrypt 2696 EXIST::FUNCTION: X509_add1_ext_i2d 2697 EXIST::FUNCTION: PKCS7_SIGNER_INFO_it 2698 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: PKCS7_SIGNER_INFO_it 2698 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -KRB5_PRINCNAME_new 2699 EXIST::FUNCTION: +KRB5_PRINCNAME_new 2699 NOEXIST::FUNCTION: PKCS12_SAFEBAG_it 2700 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: PKCS12_SAFEBAG_it 2700 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: EC_GROUP_get_order 2701 EXIST::FUNCTION:EC @@ -2192,8 +2192,8 @@ X509_ATTRIBUTE_it 2732 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA X509_ATTRIBUTE_it 2732 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: OCSP_ONEREQ_get_ext_by_NID 2733 EXIST::FUNCTION: PKCS12_decrypt_skey 2734 EXIST::FUNCTION: -KRB5_AUTHENT_it 2735 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -KRB5_AUTHENT_it 2735 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +KRB5_AUTHENT_it 2735 NOEXIST::FUNCTION: +KRB5_AUTHENT_it 2735 NOEXIST::FUNCTION: UI_dup_error_string 2736 EXIST::FUNCTION: RSAPublicKey_it 2737 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA RSAPublicKey_it 2737 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA @@ -2210,8 +2210,8 @@ PKCS12_unpack_p7encdata 2746 EXIST::FUNCTION: HMAC_CTX_init 2747 EXIST::FUNCTION: ENGINE_get_digest 2748 EXIST::FUNCTION:ENGINE OCSP_RESPONSE_print 2749 EXIST::FUNCTION: -KRB5_TKTBODY_it 2750 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -KRB5_TKTBODY_it 2750 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +KRB5_TKTBODY_it 2750 NOEXIST::FUNCTION: +KRB5_TKTBODY_it 2750 NOEXIST::FUNCTION: ACCESS_DESCRIPTION_it 2751 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: ACCESS_DESCRIPTION_it 2751 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: PKCS7_ISSUER_AND_SERIAL_it 2752 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: @@ -2239,12 +2239,12 @@ d2i_OCSP_CRLID 2768 EXIST::FUNCTION: EC_POINT_is_on_curve 2769 EXIST::FUNCTION:EC CRYPTO_set_locked_mem_ex_functions 2770 EXIST:!VMS:FUNCTION: CRYPTO_set_locked_mem_ex_funcs 2770 EXIST:VMS:FUNCTION: -d2i_KRB5_CHECKSUM 2771 EXIST::FUNCTION: +d2i_KRB5_CHECKSUM 2771 NOEXIST::FUNCTION: ASN1_item_dup 2772 EXIST::FUNCTION: X509_it 2773 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: X509_it 2773 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: BN_mod_add 2774 EXIST::FUNCTION: -KRB5_AUTHDATA_free 2775 EXIST::FUNCTION: +KRB5_AUTHDATA_free 2775 NOEXIST::FUNCTION: _ossl_old_des_cbc_cksum 2776 NOEXIST::FUNCTION: ASN1_item_verify 2777 EXIST::FUNCTION: CRYPTO_set_mem_ex_functions 2778 EXIST::FUNCTION: @@ -2265,8 +2265,8 @@ ASN1_BMPSTRING_it 2787 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI ASN1_tag2bit 2788 EXIST::FUNCTION: UI_method_set_flusher 2789 EXIST::FUNCTION: X509_ocspid_print 2790 EXIST::FUNCTION: -KRB5_ENCDATA_it 2791 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -KRB5_ENCDATA_it 2791 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +KRB5_ENCDATA_it 2791 NOEXIST::FUNCTION: +KRB5_ENCDATA_it 2791 NOEXIST::FUNCTION: ENGINE_get_load_pubkey_function 2792 EXIST::FUNCTION:ENGINE UI_add_user_data 2793 EXIST::FUNCTION: OCSP_REQUEST_delete_ext 2794 EXIST::FUNCTION: @@ -2292,7 +2292,7 @@ ASN1_FBOOLEAN_it 2806 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI UI_set_ex_data 2807 EXIST::FUNCTION: _ossl_old_des_string_to_key 2808 NOEXIST::FUNCTION: ENGINE_register_all_RSA 2809 EXIST::FUNCTION:ENGINE -d2i_KRB5_PRINCNAME 2810 EXIST::FUNCTION: +d2i_KRB5_PRINCNAME 2810 NOEXIST::FUNCTION: OCSP_RESPBYTES_it 2811 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: OCSP_RESPBYTES_it 2811 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: X509_CINF_it 2812 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: @@ -2303,7 +2303,7 @@ d2i_OCSP_SERVICELOC 2815 EXIST::FUNCTION: ENGINE_get_digests 2816 EXIST::FUNCTION:ENGINE _ossl_old_des_set_odd_parity 2817 NOEXIST::FUNCTION: OCSP_RESPDATA_free 2818 EXIST::FUNCTION: -d2i_KRB5_TICKET 2819 EXIST::FUNCTION: +d2i_KRB5_TICKET 2819 NOEXIST::FUNCTION: OTHERNAME_it 2820 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: OTHERNAME_it 2820 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: EVP_MD_CTX_cleanup 2821 EXIST::FUNCTION: @@ -2327,10 +2327,10 @@ DISPLAYTEXT_it 2836 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI X509_CRL_set_lastUpdate 2837 EXIST::FUNCTION: OCSP_BASICRESP_free 2838 EXIST::FUNCTION: OCSP_BASICRESP_add1_ext_i2d 2839 EXIST::FUNCTION: -d2i_KRB5_AUTHENTBODY 2840 EXIST::FUNCTION: +d2i_KRB5_AUTHENTBODY 2840 NOEXIST::FUNCTION: CRYPTO_set_ex_data_implementation 2841 EXIST:!VMS:FUNCTION: CRYPTO_set_ex_data_impl 2841 EXIST:VMS:FUNCTION: -KRB5_ENCDATA_new 2842 EXIST::FUNCTION: +KRB5_ENCDATA_new 2842 NOEXIST::FUNCTION: DSO_up_ref 2843 EXIST::FUNCTION: OCSP_crl_reason_str 2844 EXIST::FUNCTION: UI_get0_result_string 2845 EXIST::FUNCTION: @@ -2342,7 +2342,7 @@ ERR_load_EC_strings 2849 EXIST::FUNCTION:EC UI_get0_action_string 2850 EXIST::FUNCTION: OCSP_ONEREQ_get_ext 2851 EXIST::FUNCTION: EC_POINT_method_of 2852 EXIST::FUNCTION:EC -i2d_KRB5_APREQBODY 2853 EXIST::FUNCTION: +i2d_KRB5_APREQBODY 2853 NOEXIST::FUNCTION: _ossl_old_des_ecb3_encrypt 2854 NOEXIST::FUNCTION: CRYPTO_get_mem_ex_functions 2855 EXIST::FUNCTION: ENGINE_get_ex_data 2856 EXIST::FUNCTION:ENGINE @@ -2398,7 +2398,7 @@ OCSP_basic_sign 2897 EXIST::FUNCTION: i2d_OCSP_RESPID 2898 EXIST::FUNCTION: OCSP_check_nonce 2899 EXIST::FUNCTION: ENGINE_ctrl_cmd 2900 EXIST::FUNCTION:ENGINE -d2i_KRB5_ENCKEY 2901 EXIST::FUNCTION: +d2i_KRB5_ENCKEY 2901 NOEXIST::FUNCTION: OCSP_parse_url 2902 EXIST::FUNCTION: OCSP_SINGLERESP_get_ext 2903 EXIST::FUNCTION: OCSP_CRLID_free 2904 EXIST::FUNCTION: @@ -2458,7 +2458,7 @@ DIST_POINT_it 2950 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA DIST_POINT_it 2950 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: OCSP_SINGLERESP_it 2951 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: OCSP_SINGLERESP_it 2951 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -d2i_KRB5_TKTBODY 2952 EXIST::FUNCTION: +d2i_KRB5_TKTBODY 2952 NOEXIST::FUNCTION: EC_POINT_cmp 2953 EXIST::FUNCTION:EC OCSP_REVOKEDINFO_new 2954 EXIST::FUNCTION: i2d_OCSP_CERTSTATUS 2955 EXIST::FUNCTION: @@ -2469,7 +2469,7 @@ UI_set_method 2959 EXIST::FUNCTION: OCSP_id_get0_info 2960 EXIST::FUNCTION: BN_mod_sqrt 2961 EXIST::FUNCTION: EC_GROUP_copy 2962 EXIST::FUNCTION:EC -KRB5_ENCDATA_free 2963 EXIST::FUNCTION: +KRB5_ENCDATA_free 2963 NOEXIST::FUNCTION: _ossl_old_des_cfb_encrypt 2964 NOEXIST::FUNCTION: OCSP_SINGLERESP_get_ext_by_OBJ 2965 EXIST::FUNCTION: OCSP_cert_to_id 2966 EXIST::FUNCTION: @@ -2484,19 +2484,19 @@ PKCS12_BAGS_it 2972 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI OCSP_url_svcloc_new 2973 EXIST::FUNCTION: ASN1_template_free 2974 NOEXIST::FUNCTION: OCSP_SINGLERESP_add_ext 2975 EXIST::FUNCTION: -KRB5_AUTHENTBODY_it 2976 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -KRB5_AUTHENTBODY_it 2976 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +KRB5_AUTHENTBODY_it 2976 NOEXIST::FUNCTION: +KRB5_AUTHENTBODY_it 2976 NOEXIST::FUNCTION: X509_supported_extension 2977 EXIST::FUNCTION: -i2d_KRB5_AUTHDATA 2978 EXIST::FUNCTION: +i2d_KRB5_AUTHDATA 2978 NOEXIST::FUNCTION: UI_method_get_opener 2979 EXIST::FUNCTION: ENGINE_set_ex_data 2980 EXIST::FUNCTION:ENGINE OCSP_REQUEST_print 2981 EXIST::FUNCTION: CBIGNUM_it 2982 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: CBIGNUM_it 2982 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -KRB5_TICKET_new 2983 EXIST::FUNCTION: -KRB5_APREQ_new 2984 EXIST::FUNCTION: +KRB5_TICKET_new 2983 NOEXIST::FUNCTION: +KRB5_APREQ_new 2984 NOEXIST::FUNCTION: EC_GROUP_get_curve_GFp 2985 EXIST::FUNCTION:EC -KRB5_ENCKEY_new 2986 EXIST::FUNCTION: +KRB5_ENCKEY_new 2986 NOEXIST::FUNCTION: ASN1_template_d2i 2987 NOEXIST::FUNCTION: _ossl_old_des_quad_cksum 2988 NOEXIST::FUNCTION: OCSP_single_get0_status 2989 EXIST::FUNCTION: @@ -2509,7 +2509,7 @@ OCSP_RESPID_it 2994 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA OCSP_RESPID_it 2994 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: EC_GROUP_new 2995 EXIST::FUNCTION:EC EVP_aes_256_cbc 2996 EXIST::FUNCTION:AES -i2d_KRB5_PRINCNAME 2997 EXIST::FUNCTION: +i2d_KRB5_PRINCNAME 2997 NOEXIST::FUNCTION: _ossl_old_des_encrypt2 2998 NOEXIST::FUNCTION: _ossl_old_des_encrypt3 2999 NOEXIST::FUNCTION: PKCS8_PRIV_KEY_INFO_it 3000 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: @@ -2518,7 +2518,7 @@ OCSP_REQINFO_it 3001 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA OCSP_REQINFO_it 3001 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: PBEPARAM_it 3002 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: PBEPARAM_it 3002 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -KRB5_AUTHENTBODY_new 3003 EXIST::FUNCTION: +KRB5_AUTHENTBODY_new 3003 NOEXIST::FUNCTION: X509_CRL_add0_revoked 3004 EXIST::FUNCTION: EDIPARTYNAME_it 3005 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: EDIPARTYNAME_it 3005 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: @@ -2536,7 +2536,7 @@ OCSP_BASICRESP_get_ext_count 3014 EXIST::FUNCTION: ASN1_ENUMERATED_it 3015 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: ASN1_ENUMERATED_it 3015 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: UI_set_result 3016 EXIST::FUNCTION: -i2d_KRB5_TICKET 3017 EXIST::FUNCTION: +i2d_KRB5_TICKET 3017 NOEXIST::FUNCTION: X509_print_ex_fp 3018 EXIST::FUNCTION:STDIO EVP_CIPHER_CTX_set_padding 3019 EXIST::FUNCTION: d2i_OCSP_RESPONSE 3020 EXIST::FUNCTION: @@ -2546,7 +2546,7 @@ _ossl_old_des_enc_write 3022 NOEXIST::FUNCTION: OCSP_RESPONSE_new 3023 EXIST::FUNCTION: AES_set_encrypt_key 3024 EXIST::FUNCTION:AES OCSP_resp_count 3025 EXIST::FUNCTION: -KRB5_CHECKSUM_new 3026 EXIST::FUNCTION: +KRB5_CHECKSUM_new 3026 NOEXIST::FUNCTION: ENGINE_load_cswift 3027 EXIST::FUNCTION:ENGINE,STATIC_ENGINE OCSP_onereq_get0_id 3028 EXIST::FUNCTION: ENGINE_set_default_ciphers 3029 EXIST::FUNCTION:ENGINE @@ -2561,7 +2561,7 @@ ASN1_ANY_it 3035 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA ASN1_ANY_it 3035 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: CRYPTO_ex_data_new_class 3036 EXIST::FUNCTION: _ossl_old_des_ncbc_encrypt 3037 NOEXIST::FUNCTION: -i2d_KRB5_TKTBODY 3038 EXIST::FUNCTION: +i2d_KRB5_TKTBODY 3038 NOEXIST::FUNCTION: EC_POINT_clear_free 3039 EXIST::FUNCTION:EC AES_decrypt 3040 EXIST::FUNCTION:AES asn1_enc_init 3041 NOEXIST::FUNCTION: @@ -2569,10 +2569,10 @@ UI_get_result_maxsize 3042 EXIST::FUNCTION: OCSP_CERTID_new 3043 EXIST::FUNCTION: ENGINE_unregister_RAND 3044 EXIST::FUNCTION:ENGINE UI_method_get_closer 3045 EXIST::FUNCTION: -d2i_KRB5_ENCDATA 3046 EXIST::FUNCTION: +d2i_KRB5_ENCDATA 3046 NOEXIST::FUNCTION: OCSP_request_onereq_count 3047 EXIST::FUNCTION: OCSP_basic_verify 3048 EXIST::FUNCTION: -KRB5_AUTHENTBODY_free 3049 EXIST::FUNCTION: +KRB5_AUTHENTBODY_free 3049 NOEXIST::FUNCTION: ASN1_item_d2i 3050 EXIST::FUNCTION: ASN1_primitive_free 3051 NOEXIST::FUNCTION: i2d_EXTENDED_KEY_USAGE 3052 EXIST::FUNCTION: @@ -2586,28 +2586,28 @@ OCSP_accept_responses_new 3058 EXIST::FUNCTION: asn1_do_lock 3059 NOEXIST::FUNCTION: PKCS7_ATTR_VERIFY_it 3060 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: PKCS7_ATTR_VERIFY_it 3060 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -KRB5_APREQBODY_it 3061 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -KRB5_APREQBODY_it 3061 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +KRB5_APREQBODY_it 3061 NOEXIST::FUNCTION: +KRB5_APREQBODY_it 3061 NOEXIST::FUNCTION: i2d_OCSP_SINGLERESP 3062 EXIST::FUNCTION: ASN1_item_ex_new 3063 EXIST::FUNCTION: UI_add_verify_string 3064 EXIST::FUNCTION: _ossl_old_des_set_key 3065 NOEXIST::FUNCTION: -KRB5_PRINCNAME_it 3066 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -KRB5_PRINCNAME_it 3066 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +KRB5_PRINCNAME_it 3066 NOEXIST::FUNCTION: +KRB5_PRINCNAME_it 3066 NOEXIST::FUNCTION: EVP_DecryptInit_ex 3067 EXIST::FUNCTION: i2d_OCSP_CERTID 3068 EXIST::FUNCTION: ASN1_item_d2i_bio 3069 EXIST::FUNCTION: EC_POINT_dbl 3070 EXIST::FUNCTION:EC asn1_get_choice_selector 3071 NOEXIST::FUNCTION: -i2d_KRB5_CHECKSUM 3072 EXIST::FUNCTION: +i2d_KRB5_CHECKSUM 3072 NOEXIST::FUNCTION: ENGINE_set_table_flags 3073 EXIST::FUNCTION:ENGINE AES_options 3074 EXIST::FUNCTION:AES ENGINE_load_chil 3075 EXIST::FUNCTION:ENGINE,STATIC_ENGINE OCSP_id_cmp 3076 EXIST::FUNCTION: OCSP_BASICRESP_new 3077 EXIST::FUNCTION: OCSP_REQUEST_get_ext_by_NID 3078 EXIST::FUNCTION: -KRB5_APREQ_it 3079 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -KRB5_APREQ_it 3079 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +KRB5_APREQ_it 3079 NOEXIST::FUNCTION: +KRB5_APREQ_it 3079 NOEXIST::FUNCTION: ENGINE_get_destroy_function 3080 EXIST::FUNCTION:ENGINE CONF_set_nconf 3081 EXIST::FUNCTION: ASN1_PRINTABLE_free 3082 EXIST::FUNCTION: @@ -2618,15 +2618,15 @@ X509V3_extensions_print 3085 EXIST::FUNCTION: _ossl_old_des_cfb64_encrypt 3086 NOEXIST::FUNCTION: X509_REVOKED_add1_ext_i2d 3087 EXIST::FUNCTION: _ossl_old_des_ofb_encrypt 3088 NOEXIST::FUNCTION: -KRB5_TKTBODY_new 3089 EXIST::FUNCTION: +KRB5_TKTBODY_new 3089 NOEXIST::FUNCTION: ASN1_OCTET_STRING_it 3090 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: ASN1_OCTET_STRING_it 3090 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: ERR_load_UI_strings 3091 EXIST::FUNCTION: -i2d_KRB5_ENCKEY 3092 EXIST::FUNCTION: +i2d_KRB5_ENCKEY 3092 NOEXIST::FUNCTION: ASN1_template_new 3093 NOEXIST::FUNCTION: OCSP_SIGNATURE_free 3094 EXIST::FUNCTION: ASN1_item_i2d_fp 3095 EXIST::FUNCTION:STDIO -KRB5_PRINCNAME_free 3096 EXIST::FUNCTION: +KRB5_PRINCNAME_free 3096 NOEXIST::FUNCTION: PKCS7_RECIP_INFO_it 3097 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: PKCS7_RECIP_INFO_it 3097 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: EXTENDED_KEY_USAGE_it 3098 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: @@ -2635,7 +2635,7 @@ EC_GFp_simple_method 3099 EXIST::FUNCTION:EC EC_GROUP_precompute_mult 3100 EXIST::FUNCTION:EC OCSP_request_onereq_get0 3101 EXIST::FUNCTION: UI_method_set_writer 3102 EXIST::FUNCTION: -KRB5_AUTHENT_new 3103 EXIST::FUNCTION: +KRB5_AUTHENT_new 3103 NOEXIST::FUNCTION: X509_CRL_INFO_it 3104 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: X509_CRL_INFO_it 3104 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: DSO_set_name_converter 3105 EXIST::FUNCTION: @@ -2658,8 +2658,8 @@ OCSP_request_add1_cert 3117 EXIST::FUNCTION: UI_get0_output_string 3118 EXIST::FUNCTION: UI_dup_verify_string 3119 EXIST::FUNCTION: BN_mod_lshift 3120 EXIST::FUNCTION: -KRB5_AUTHDATA_it 3121 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -KRB5_AUTHDATA_it 3121 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +KRB5_AUTHDATA_it 3121 NOEXIST::FUNCTION: +KRB5_AUTHDATA_it 3121 NOEXIST::FUNCTION: asn1_set_choice_selector 3122 NOEXIST::FUNCTION: OCSP_basic_add1_status 3123 EXIST::FUNCTION: OCSP_RESPID_free 3124 EXIST::FUNCTION: @@ -2667,7 +2667,7 @@ asn1_get_field_ptr 3125 NOEXIST::FUNCTION: UI_add_input_string 3126 EXIST::FUNCTION: OCSP_CRLID_it 3127 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: OCSP_CRLID_it 3127 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -i2d_KRB5_AUTHENTBODY 3128 EXIST::FUNCTION: +i2d_KRB5_AUTHENTBODY 3128 NOEXIST::FUNCTION: OCSP_REQUEST_get_ext_count 3129 EXIST::FUNCTION: ENGINE_load_atalla 3130 EXIST::FUNCTION:ENGINE,STATIC_ENGINE X509_NAME_it 3131 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: @@ -2679,7 +2679,7 @@ OCSP_BASICRESP_get_ext 3134 EXIST::FUNCTION: CRYPTO_get_ex_data_implementation 3135 EXIST:!VMS:FUNCTION: CRYPTO_get_ex_data_impl 3135 EXIST:VMS:FUNCTION: ASN1_item_pack 3136 EXIST::FUNCTION: -i2d_KRB5_ENCDATA 3137 EXIST::FUNCTION: +i2d_KRB5_ENCDATA 3137 NOEXIST::FUNCTION: X509_PURPOSE_set 3138 EXIST::FUNCTION: X509_REQ_INFO_it 3139 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: X509_REQ_INFO_it 3139 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: @@ -2700,10 +2700,10 @@ ASN1_NULL_it 3150 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI BN_mod_lshift1 3151 EXIST::FUNCTION: d2i_OCSP_ONEREQ 3152 EXIST::FUNCTION: OCSP_ONEREQ_new 3153 EXIST::FUNCTION: -KRB5_TICKET_it 3154 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -KRB5_TICKET_it 3154 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +KRB5_TICKET_it 3154 NOEXIST::FUNCTION: +KRB5_TICKET_it 3154 NOEXIST::FUNCTION: EVP_aes_192_cbc 3155 EXIST::FUNCTION:AES -KRB5_TICKET_free 3156 EXIST::FUNCTION: +KRB5_TICKET_free 3156 NOEXIST::FUNCTION: UI_new 3157 EXIST::FUNCTION: OCSP_response_create 3158 EXIST::FUNCTION: _ossl_old_des_xcbc_encrypt 3159 NOEXIST::FUNCTION: @@ -2731,7 +2731,7 @@ i2d_ASN1_T61STRING 3175 EXIST::FUNCTION: EC_POINT_set_to_infinity 3176 EXIST::FUNCTION:EC ERR_load_OCSP_strings 3177 EXIST::FUNCTION: EC_POINT_point2oct 3178 EXIST::FUNCTION:EC -KRB5_APREQ_free 3179 EXIST::FUNCTION: +KRB5_APREQ_free 3179 NOEXIST::FUNCTION: ASN1_OBJECT_it 3180 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: ASN1_OBJECT_it 3180 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: OCSP_crlID_new 3181 EXIST:!OS2,!VMS:FUNCTION: diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 7b5705534d..00a3efebac 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -139,7 +139,6 @@ and [options] can be one of no-ssl3 - Skip this version of SSL just-ssl - remove all non-ssl keys/digest no-asm - No x86 asm - no-krb5 - No KRB5 no-srp - No SRP no-ec - No EC no-engine - No engine @@ -294,7 +293,6 @@ $cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext; $cflags.=" -DOPENSSL_NO_SRP" if $no_srp; $cflags.=" -DOPENSSL_NO_CMS" if $no_cms; $cflags.=" -DOPENSSL_NO_ERR" if $no_err; -$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5; $cflags.=" -DOPENSSL_NO_EC" if $no_ec; $cflags.=" -DOPENSSL_NO_GOST" if $no_gost; $cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine; @@ -381,18 +379,12 @@ for (;;) $dir=$val; } - if ($key eq "KRB5_INCLUDES") - { $cflags .= " $val";} - if ($key eq "ZLIB_INCLUDE") { $cflags .= " $val" if $val ne "";} if ($key eq "LIBZLIB") { $zlib_lib = "$val" if $val ne "";} - if ($key eq "LIBKRB5") - { $ex_libs .= " $val" if $val ne "";} - if ($key eq "EX_LIBS") { $ex_libs .= " $val" if $val ne "";} @@ -1407,7 +1399,6 @@ sub read_options "no-ec_nistp_64_gcc_128" => 0, "no-err" => \$no_err, "no-sock" => \$no_sock, - "no-krb5" => \$no_krb5, "no-ec" => \$no_ec, "no-gost" => \$no_gost, "no-engine" => \$no_engine, @@ -1494,22 +1485,6 @@ sub read_options $xcflags="-DOPENSSL_EXPERIMENTAL_$ALGO $xcflags"; } - elsif (/^--with-krb5-flavor=(.*)$/) - { - my $krb5_flavor = $1; - if ($krb5_flavor =~ /^force-[Hh]eimdal$/) - { - $xcflags="-DKRB5_HEIMDAL $xcflags"; - } - elsif ($krb5_flavor =~ /^MIT/i) - { - $xcflags="-DKRB5_MIT $xcflags"; - if ($krb5_flavor =~ /^MIT[._-]*1[._-]*[01]/i) - { - $xcflags="-DKRB5_MIT_OLD11 $xcflags" - } - } - } elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; } elsif (/^-[lL].*$/) { $l_flags.="$_ "; } elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/) diff --git a/util/mkdef.pl b/util/mkdef.pl index 188a408002..6c4ce3fa3a 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -77,7 +77,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "BIO", "COMP", "BUFFER", "LHASH", "STACK", "ERR", "LOCKING", # External "algorithms" - "FP_API", "STDIO", "SOCK", "KRB5", "DGRAM", + "FP_API", "STDIO", "SOCK", "DGRAM", # Engines "STATIC_ENGINE", "ENGINE", "HW", "GMP", # TLS @@ -121,7 +121,7 @@ close(IN); my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf; my $no_cast; my $no_whirlpool; my $no_camellia; my $no_seed; my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; -my $no_rsa; my $no_dsa; my $no_dh; my $no_aes; my $no_krb5; +my $no_rsa; my $no_dsa; my $no_dh; my $no_aes; my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng; @@ -210,7 +210,6 @@ foreach (@ARGV, split(/ /, $options)) #elsif (/^no-locking$/) { $no_locking=1; } elsif (/^no-comp$/) { $no_comp=1; } elsif (/^no-dso$/) { $no_dso=1; } - elsif (/^no-krb5$/) { $no_krb5=1; } elsif (/^no-engine$/) { $no_engine=1; } elsif (/^no-hw$/) { $no_hw=1; } elsif (/^no-gmp$/) { $no_gmp=1; } @@ -319,7 +318,6 @@ $crypto.=" include/openssl/rand.h"; $crypto.=" include/openssl/comp.h" ; # unless $no_comp; $crypto.=" include/openssl/ocsp.h"; $crypto.=" include/openssl/ui.h"; -$crypto.=" include/openssl/krb5_asn.h"; #$crypto.=" include/openssl/store.h"; $crypto.=" include/openssl/pqueue.h"; $crypto.=" include/openssl/cms.h"; @@ -1195,7 +1193,6 @@ sub is_valid if ($keyword eq "BIO" && $no_bio) { return 0; } if ($keyword eq "COMP" && $no_comp) { return 0; } if ($keyword eq "DSO" && $no_dso) { return 0; } - if ($keyword eq "KRB5" && $no_krb5) { return 0; } if ($keyword eq "ENGINE" && $no_engine) { return 0; } if ($keyword eq "HW" && $no_hw) { return 0; } if ($keyword eq "FP_API" && $no_fp_api) { return 0; } diff --git a/util/mkfiles.pl b/util/mkfiles.pl index a81434b2cf..268acadb62 100755 --- a/util/mkfiles.pl +++ b/util/mkfiles.pl @@ -58,7 +58,6 @@ my @dirs = ( "crypto/engine", "crypto/ocsp", "crypto/ui", -"crypto/krb5", #"crypto/store", "crypto/pqueue", "crypto/whrlpool", |