diff options
Diffstat (limited to 'crypto/openssl/util')
| -rwxr-xr-x | crypto/openssl/util/domd | 2 | ||||
| -rwxr-xr-x | crypto/openssl/util/libeay.num | 406 | ||||
| -rwxr-xr-x | crypto/openssl/util/mk1mf.pl | 3 | ||||
| -rwxr-xr-x | crypto/openssl/util/mkdef.pl | 139 | ||||
| -rw-r--r-- | crypto/openssl/util/mkerr.pl | 28 | ||||
| -rw-r--r-- | crypto/openssl/util/pl/BC-32.pl | 4 | ||||
| -rw-r--r-- | crypto/openssl/util/pl/Mingw32.pl | 1 | ||||
| -rw-r--r-- | crypto/openssl/util/pl/VC-32.pl | 2 | ||||
| -rwxr-xr-x | crypto/openssl/util/ssleay.num | 10 |
9 files changed, 556 insertions, 39 deletions
diff --git a/crypto/openssl/util/domd b/crypto/openssl/util/domd index 324051f60b25..9f75131f221e 100755 --- a/crypto/openssl/util/domd +++ b/crypto/openssl/util/domd @@ -7,5 +7,5 @@ shift cp Makefile.ssl Makefile.save makedepend -f Makefile.ssl $@ -$TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new +perl $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new mv Makefile.new Makefile.ssl diff --git a/crypto/openssl/util/libeay.num b/crypto/openssl/util/libeay.num index 59c2040a29df..f611d6b28362 100755 --- a/crypto/openssl/util/libeay.num +++ b/crypto/openssl/util/libeay.num @@ -499,9 +499,9 @@ SHA1_Update 504 SHA_Final 505 SHA_Init 506 SHA_Update 507 -SSLeay_add_all_algorithms 508 -SSLeay_add_all_ciphers 509 -SSLeay_add_all_digests 510 +OpenSSL_add_all_algorithms 508 +OpenSSL_add_all_ciphers 509 +OpenSSL_add_all_digests 510 TXT_DB_create_index 511 TXT_DB_free 512 TXT_DB_get_by_index 513 @@ -1304,13 +1304,12 @@ i2d_SXNETID 1329 d2i_SXNETID 1330 SXNETID_new 1331 SXNETID_free 1332 -DSA_SIG_new 1333 -DSA_SIG_free 1334 -DSA_do_sign 1335 -DSA_do_verify 1336 -d2i_DSA_SIG 1337 -i2d_DSA_SIG 1338 - +DSA_SIG_new 1333 +DSA_SIG_free 1334 +DSA_do_sign 1335 +DSA_do_verify 1336 +d2i_DSA_SIG 1337 +i2d_DSA_SIG 1338 i2d_ASN1_VISIBLESTRING 1339 d2i_ASN1_VISIBLESTRING 1340 i2d_ASN1_UTF8STRING 1341 @@ -1844,3 +1843,390 @@ sk_DIST_POINT_sort 1868 RSA_check_key 1869 OBJ_obj2txt 1870 DSA_dup_DH 1871 +X509_REQ_get_extensions 1872 +X509_REQ_set_extension_nids 1873 +BIO_nwrite 1874 +X509_REQ_extension_nid 1875 +BIO_nread 1876 +X509_REQ_get_extension_nids 1877 +BIO_nwrite0 1878 +X509_REQ_add_extensions_nid 1879 +BIO_nread0 1880 +X509_REQ_add_extensions 1881 +BIO_new_mem_buf 1882 +DH_set_ex_data 1883 +DH_set_method 1884 +DSA_OpenSSL 1885 +DH_get_ex_data 1886 +DH_get_ex_new_index 1887 +DSA_new_method 1888 +DH_new_method 1889 +DH_OpenSSL 1890 +DSA_get_ex_new_index 1891 +DH_get_default_method 1892 +DSA_set_ex_data 1893 +DH_set_default_method 1894 +DSA_get_ex_data 1895 +X509V3_EXT_REQ_add_conf 1896 +NETSCAPE_SPKI_print 1897 +NETSCAPE_SPKI_set_pubkey 1898 +NETSCAPE_SPKI_b64_encode 1899 +NETSCAPE_SPKI_get_pubkey 1900 +NETSCAPE_SPKI_b64_decode 1901 +UTF8_putc 1902 +UTF8_getc 1903 +RSA_null_method 1904 +ASN1_tag2str 1905 +BIO_ctrl_reset_read_request 1906 +DISPLAYTEXT_new 1907 +ASN1_GENERALIZEDTIME_free 1908 +X509_REVOKED_get_ext_d2i 1909 +X509_set_ex_data 1910 +X509_reject_set_bit_asc 1911 +X509_NAME_add_entry_by_txt 1912 +sk_X509_TRUST_pop 1913 +X509_NAME_add_entry_by_NID 1914 +X509_PURPOSE_get0 1915 +sk_ACCESS_DESCRIPTION_shift 1916 +PEM_read_X509_AUX 1917 +d2i_AUTHORITY_INFO_ACCESS 1918 +sk_X509_TRUST_set_cmp_func 1919 +sk_X509_TRUST_free 1920 +PEM_write_PUBKEY 1921 +sk_X509_TRUST_num 1922 +sk_ACCESS_DESCRIPTION_delete 1923 +sk_ASN1_STRING_TABLE_value 1924 +ACCESS_DESCRIPTION_new 1925 +X509_CERT_AUX_free 1926 +d2i_ACCESS_DESCRIPTION 1927 +X509_trust_clear 1928 +sk_X509_PURPOSE_value 1929 +sk_X509_PURPOSE_zero 1930 +X509_TRUST_add 1931 +ASN1_VISIBLESTRING_new 1932 +X509_alias_set1 1933 +ASN1_PRINTABLESTRING_free 1934 +EVP_PKEY_get1_DSA 1935 +ASN1_BMPSTRING_new 1936 +ASN1_mbstring_copy 1937 +ASN1_UTF8STRING_new 1938 +sk_ACCESS_DESCRIPTION_set 1939 +sk_X509_PURPOSE_pop 1940 +DSA_get_default_method 1941 +sk_X509_PURPOSE_push 1942 +sk_X509_PURPOSE_delete 1943 +sk_X509_PURPOSE_num 1944 +i2d_ASN1_SET_OF_ACCESS_DESCRIPTION 1945 +ASN1_T61STRING_free 1946 +sk_ACCESS_DESCRIPTION_free 1947 +sk_ASN1_STRING_TABLE_pop 1948 +DSA_set_method 1949 +X509_get_ex_data 1950 +ASN1_STRING_type 1951 +X509_PURPOSE_get_by_sname 1952 +sk_X509_PURPOSE_find 1953 +ASN1_TIME_free 1954 +ASN1_OCTET_STRING_cmp 1955 +sk_ACCESS_DESCRIPTION_value 1956 +ASN1_BIT_STRING_new 1957 +X509_get_ext_d2i 1958 +PEM_read_bio_X509_AUX 1959 +ASN1_STRING_set_default_mask_asc 1960 +PEM_write_bio_RSA_PUBKEY 1961 +sk_ASN1_STRING_TABLE_num 1962 +ASN1_INTEGER_cmp 1963 +d2i_RSA_PUBKEY_fp 1964 +sk_ACCESS_DESCRIPTION_unshift 1965 +sk_ASN1_STRING_TABLE_delete_ptr 1966 +X509_trust_set_bit_asc 1967 +PEM_write_bio_DSA_PUBKEY 1968 +X509_STORE_CTX_free 1969 +EVP_PKEY_set1_DSA 1970 +i2d_DSA_PUBKEY_fp 1971 +X509_load_cert_crl_file 1972 +ASN1_TIME_new 1973 +i2d_RSA_PUBKEY 1974 +sk_X509_TRUST_pop_free 1975 +X509_STORE_CTX_purpose_inherit 1976 +PEM_read_RSA_PUBKEY 1977 +sk_X509_TRUST_zero 1978 +sk_ACCESS_DESCRIPTION_pop_free 1979 +d2i_X509_AUX 1980 +i2d_DSA_PUBKEY 1981 +X509_CERT_AUX_print 1982 +sk_X509_PURPOSE_new_null 1983 +PEM_read_DSA_PUBKEY 1984 +i2d_RSA_PUBKEY_bio 1985 +ASN1_BIT_STRING_num_asc 1986 +i2d_PUBKEY 1987 +ASN1_UTCTIME_free 1988 +DSA_set_default_method 1989 +X509_PURPOSE_get_by_id 1990 +sk_X509_TRUST_push 1991 +sk_ASN1_STRING_TABLE_sort 1992 +sk_X509_PURPOSE_set_cmp_func 1993 +ACCESS_DESCRIPTION_free 1994 +PEM_read_bio_PUBKEY 1995 +ASN1_STRING_set_by_NID 1996 +X509_PURPOSE_get_id 1997 +DISPLAYTEXT_free 1998 +OTHERNAME_new 1999 +sk_X509_TRUST_find 2000 +X509_CERT_AUX_new 2001 +sk_ACCESS_DESCRIPTION_dup 2002 +sk_ASN1_STRING_TABLE_pop_free 2003 +sk_ASN1_STRING_TABLE_unshift 2004 +sk_X509_TRUST_shift 2005 +sk_ACCESS_DESCRIPTION_zero 2006 +X509_TRUST_cleanup 2007 +X509_NAME_add_entry_by_OBJ 2008 +X509_CRL_get_ext_d2i 2009 +sk_X509_TRUST_set 2010 +X509_PURPOSE_get0_name 2011 +PEM_read_PUBKEY 2012 +sk_ACCESS_DESCRIPTION_new 2013 +i2d_DSA_PUBKEY_bio 2014 +i2d_OTHERNAME 2015 +ASN1_OCTET_STRING_free 2016 +ASN1_BIT_STRING_set_asc 2017 +sk_ACCESS_DESCRIPTION_push 2018 +X509_get_ex_new_index 2019 +ASN1_STRING_TABLE_cleanup 2020 +X509_TRUST_get_by_id 2021 +X509_PURPOSE_get_trust 2022 +ASN1_STRING_length 2023 +d2i_ASN1_SET_OF_ACCESS_DESCRIPTION 2024 +ASN1_PRINTABLESTRING_new 2025 +X509V3_get_d2i 2026 +ASN1_ENUMERATED_free 2027 +i2d_X509_CERT_AUX 2028 +sk_ACCESS_DESCRIPTION_find 2029 +X509_STORE_CTX_set_trust 2030 +sk_X509_PURPOSE_unshift 2031 +ASN1_STRING_set_default_mask 2032 +X509_STORE_CTX_new 2033 +EVP_PKEY_get1_RSA 2034 +sk_X509_PURPOSE_set 2035 +sk_ASN1_STRING_TABLE_insert 2036 +sk_X509_PURPOSE_sort 2037 +DIRECTORYSTRING_free 2038 +PEM_write_X509_AUX 2039 +ASN1_OCTET_STRING_set 2040 +d2i_DSA_PUBKEY_fp 2041 +sk_ASN1_STRING_TABLE_free 2042 +sk_X509_TRUST_value 2043 +d2i_RSA_PUBKEY 2044 +sk_ASN1_STRING_TABLE_set 2045 +X509_TRUST_get0_name 2046 +X509_TRUST_get0 2047 +AUTHORITY_INFO_ACCESS_free 2048 +ASN1_IA5STRING_new 2049 +d2i_DSA_PUBKEY 2050 +X509_check_purpose 2051 +ASN1_ENUMERATED_new 2052 +d2i_RSA_PUBKEY_bio 2053 +d2i_PUBKEY 2054 +X509_TRUST_get_trust 2055 +X509_TRUST_get_flags 2056 +ASN1_BMPSTRING_free 2057 +ASN1_T61STRING_new 2058 +sk_X509_TRUST_unshift 2059 +ASN1_UTCTIME_new 2060 +sk_ACCESS_DESCRIPTION_pop 2061 +i2d_AUTHORITY_INFO_ACCESS 2062 +EVP_PKEY_set1_RSA 2063 +X509_STORE_CTX_set_purpose 2064 +ASN1_IA5STRING_free 2065 +PEM_write_bio_X509_AUX 2066 +X509_PURPOSE_get_count 2067 +CRYPTO_add_info 2068 +sk_ACCESS_DESCRIPTION_num 2069 +sk_ASN1_STRING_TABLE_set_cmp_func 2070 +X509_NAME_ENTRY_create_by_txt 2071 +ASN1_STRING_get_default_mask 2072 +sk_X509_TRUST_dup 2073 +X509_alias_get0 2074 +ASN1_STRING_data 2075 +sk_X509_TRUST_insert 2076 +i2d_ACCESS_DESCRIPTION 2077 +X509_trust_set_bit 2078 +sk_X509_PURPOSE_delete_ptr 2079 +ASN1_BIT_STRING_free 2080 +PEM_read_bio_RSA_PUBKEY 2081 +X509_add1_reject_object 2082 +X509_check_trust 2083 +sk_X509_TRUST_new_null 2084 +sk_ACCESS_DESCRIPTION_new_null 2085 +sk_ACCESS_DESCRIPTION_delete_ptr 2086 +sk_X509_TRUST_sort 2087 +PEM_read_bio_DSA_PUBKEY 2088 +sk_X509_TRUST_new 2089 +X509_PURPOSE_add 2090 +ASN1_STRING_TABLE_get 2091 +ASN1_UTF8STRING_free 2092 +d2i_DSA_PUBKEY_bio 2093 +sk_ASN1_STRING_TABLE_delete 2094 +PEM_write_RSA_PUBKEY 2095 +d2i_OTHERNAME 2096 +sk_ACCESS_DESCRIPTION_insert 2097 +X509_reject_set_bit 2098 +sk_X509_TRUST_delete_ptr 2099 +sk_X509_PURPOSE_pop_free 2100 +PEM_write_DSA_PUBKEY 2101 +sk_X509_PURPOSE_free 2102 +sk_X509_PURPOSE_dup 2103 +sk_ASN1_STRING_TABLE_zero 2104 +X509_PURPOSE_get0_sname 2105 +sk_ASN1_STRING_TABLE_shift 2106 +EVP_PKEY_set1_DH 2107 +ASN1_OCTET_STRING_dup 2108 +ASN1_BIT_STRING_set 2109 +X509_TRUST_get_count 2110 +ASN1_INTEGER_free 2111 +OTHERNAME_free 2112 +i2d_RSA_PUBKEY_fp 2113 +ASN1_INTEGER_dup 2114 +d2i_X509_CERT_AUX 2115 +sk_ASN1_STRING_TABLE_new_null 2116 +PEM_write_bio_PUBKEY 2117 +ASN1_VISIBLESTRING_free 2118 +X509_PURPOSE_cleanup 2119 +sk_ASN1_STRING_TABLE_push 2120 +sk_ASN1_STRING_TABLE_dup 2121 +sk_X509_PURPOSE_shift 2122 +ASN1_mbstring_ncopy 2123 +sk_X509_PURPOSE_new 2124 +sk_X509_PURPOSE_insert 2125 +ASN1_GENERALIZEDTIME_new 2126 +sk_ACCESS_DESCRIPTION_sort 2127 +EVP_PKEY_get1_DH 2128 +sk_ACCESS_DESCRIPTION_set_cmp_func 2129 +ASN1_OCTET_STRING_new 2130 +ASN1_INTEGER_new 2131 +i2d_X509_AUX 2132 +sk_ASN1_STRING_TABLE_find 2133 +ASN1_BIT_STRING_name_print 2134 +X509_cmp 2135 +ASN1_STRING_length_set 2136 +DIRECTORYSTRING_new 2137 +sk_ASN1_STRING_TABLE_new 2138 +sk_X509_TRUST_delete 2139 +X509_add1_trust_object 2140 +PKCS12_newpass 2141 +SMIME_write_PKCS7 2142 +SMIME_read_PKCS7 2143 +des_set_key_checked 2144 +PKCS7_verify 2145 +PKCS7_encrypt 2146 +des_set_key_unchecked 2147 +SMIME_crlf_copy 2148 +i2d_ASN1_PRINTABLESTRING 2149 +PKCS7_get0_signers 2150 +PKCS7_decrypt 2151 +SMIME_text 2152 +PKCS7_simple_smimecap 2153 +PKCS7_get_smimecap 2154 +PKCS7_sign 2155 +PKCS7_add_attrib_smimecap 2156 +CRYPTO_dbg_set_options 2157 +CRYPTO_remove_all_info 2158 +CRYPTO_get_mem_debug_functions 2159 +CRYPTO_is_mem_check_on 2160 +CRYPTO_set_mem_debug_functions 2161 +CRYPTO_pop_info 2162 +CRYPTO_push_info_ 2163 +CRYPTO_set_mem_debug_options 2164 +PEM_write_PKCS8PrivateKey_nid 2165 +PEM_write_bio_PKCS8PrivateKey_nid 2166 +d2i_PKCS8PrivateKey_bio 2167 +ASN1_NULL_free 2168 +d2i_ASN1_NULL 2169 +ASN1_NULL_new 2170 +i2d_PKCS8PrivateKey_bio 2171 +i2d_PKCS8PrivateKey_fp 2172 +i2d_ASN1_NULL 2173 +i2d_PKCS8PrivateKey_nid_fp 2174 +d2i_PKCS8PrivateKey_fp 2175 +i2d_PKCS8PrivateKey_nid_bio 2176 +i2d_PKCS8PrivateKeyInfo_fp 2177 +i2d_PKCS8PrivateKeyInfo_bio 2178 +PEM_cb 2179 +i2d_PrivateKey_fp 2180 +d2i_PrivateKey_bio 2181 +d2i_PrivateKey_fp 2182 +i2d_PrivateKey_bio 2183 +X509_reject_clear 2184 +X509_TRUST_set_default 2185 +d2i_AutoPrivateKey 2186 +X509_ATTRIBUTE_get0_type 2187 +X509_ATTRIBUTE_set1_data 2188 +X509at_get_attr 2189 +X509at_get_attr_count 2190 +X509_ATTRIBUTE_create_by_NID 2191 +X509_ATTRIBUTE_set1_object 2192 +X509_ATTRIBUTE_count 2193 +X509_ATTRIBUTE_create_by_OBJ 2194 +X509_ATTRIBUTE_get0_object 2195 +X509at_get_attr_by_NID 2196 +X509at_add1_attr 2197 +X509_ATTRIBUTE_get0_data 2198 +X509at_delete_attr 2199 +X509at_get_attr_by_OBJ 2200 +RAND_add 2201 +BIO_number_written 2202 +BIO_number_read 2203 +X509_STORE_CTX_get1_chain 2204 +ERR_load_RAND_strings 2205 +RAND_pseudo_bytes 2206 +X509_REQ_get_attr_by_NID 2207 +X509_REQ_get_attr 2208 +X509_REQ_add1_attr_by_NID 2209 +X509_REQ_get_attr_by_OBJ 2210 +X509at_add1_attr_by_NID 2211 +X509_REQ_add1_attr_by_OBJ 2212 +X509_REQ_get_attr_count 2213 +X509_REQ_add1_attr 2214 +X509_REQ_delete_attr 2215 +X509at_add1_attr_by_OBJ 2216 +X509_REQ_add1_attr_by_txt 2217 +X509_ATTRIBUTE_create_by_txt 2218 +X509at_add1_attr_by_txt 2219 +sk_CRYPTO_EX_DATA_FUNCS_delete 2220 +sk_CRYPTO_EX_DATA_FUNCS_set 2221 +sk_CRYPTO_EX_DATA_FUNCS_unshift 2222 +sk_CRYPTO_EX_DATA_FUNCS_new_null 2223 +sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func 2224 +sk_CRYPTO_EX_DATA_FUNCS_sort 2225 +sk_CRYPTO_EX_DATA_FUNCS_dup 2226 +sk_CRYPTO_EX_DATA_FUNCS_shift 2227 +sk_CRYPTO_EX_DATA_FUNCS_value 2228 +sk_CRYPTO_EX_DATA_FUNCS_pop 2229 +sk_CRYPTO_EX_DATA_FUNCS_push 2230 +sk_CRYPTO_EX_DATA_FUNCS_find 2231 +sk_CRYPTO_EX_DATA_FUNCS_new 2232 +sk_CRYPTO_EX_DATA_FUNCS_free 2233 +sk_CRYPTO_EX_DATA_FUNCS_delete_ptr 2234 +sk_CRYPTO_EX_DATA_FUNCS_num 2235 +sk_CRYPTO_EX_DATA_FUNCS_pop_free 2236 +sk_CRYPTO_EX_DATA_FUNCS_insert 2237 +sk_CRYPTO_EX_DATA_FUNCS_zero 2238 +BN_pseudo_rand 2239 +BN_is_prime_fasttest 2240 +BN_CTX_end 2241 +BN_CTX_start 2242 +BN_CTX_get 2243 +EVP_PKEY2PKCS8_broken 2244 +ASN1_STRING_TABLE_add 2245 +CRYPTO_dbg_get_options 2246 +AUTHORITY_INFO_ACCESS_new 2247 +CRYPTO_get_mem_debug_options 2248 +des_crypt 2249 +PEM_write_bio_X509_REQ_NEW 2250 +PEM_write_X509_REQ_NEW 2251 +BIO_callback_ctrl 2252 +RAND_egd 2253 +RAND_status 2254 +bn_dump1 2255 +des_check_key_parity 2256 +lh_num_items 2257 +RAND_event 2258 diff --git a/crypto/openssl/util/mk1mf.pl b/crypto/openssl/util/mk1mf.pl index 6fbf3ceca6a4..100d76f27933 100755 --- a/crypto/openssl/util/mk1mf.pl +++ b/crypto/openssl/util/mk1mf.pl @@ -8,6 +8,7 @@ $INSTALLTOP="/usr/local/ssl"; $OPTIONS=""; $ssl_version=""; +$banner="\t\@echo Building OpenSSL"; open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n"; while(<IN>) { @@ -59,6 +60,7 @@ and [options] can be one of just-ssl - remove all non-ssl keys/digest no-asm - No x86 asm nasm - Use NASM for x86 asm + gaswin - Use GNU as with Mingw32 no-socks - No socket code no-err - No error strings dll/shlib - Build shared libraries (MS) @@ -850,6 +852,7 @@ sub read_options elsif (/^no-hmac$/) { $no_hmac=1; } elsif (/^no-asm$/) { $no_asm=1; } elsif (/^nasm$/) { $nasm=1; } + elsif (/^gaswin$/) { $gaswin=1; } elsif (/^no-ssl2$/) { $no_ssl2=1; } elsif (/^no-ssl3$/) { $no_ssl3=1; } elsif (/^no-err$/) { $no_err=1; } diff --git a/crypto/openssl/util/mkdef.pl b/crypto/openssl/util/mkdef.pl index 80384af325a3..4e2845a4e191 100755 --- a/crypto/openssl/util/mkdef.pl +++ b/crypto/openssl/util/mkdef.pl @@ -6,26 +6,34 @@ # prototyped functions: it then prunes the output. # -$crypto_num="util/libeay.num"; -$ssl_num= "util/ssleay.num"; +my $crypto_num="util/libeay.num"; +my $ssl_num= "util/ssleay.num"; my $do_update = 0; my $do_crypto = 0; my $do_ssl = 0; -$rsaref = 0; +my $do_ctest = 0; +my $rsaref = 0; -$W32=1; -$NT=0; +my $W32=1; +my $NT=0; # Set this to make typesafe STACK definitions appear in DEF -$safe_stack_def = 1; +my $safe_stack_def = 1; -$options=""; +my $options=""; open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n"; while(<IN>) { $options=$1 if (/^OPTIONS=(.*)$/); } close(IN); +# The following ciphers may be excluded (by Configure). This means functions +# defined with ifndef(NO_XXX) are not included in the .def file, and everything +# in directory xxx is ignored. +my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf; +my $no_cast; my $no_md2; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; +my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; + foreach (@ARGV, split(/ /, $options)) { $W32=1 if $_ eq "32"; @@ -39,6 +47,7 @@ foreach (@ARGV, split(/ /, $options)) $do_crypto=1 if $_ eq "libeay"; $do_crypto=1 if $_ eq "crypto"; $do_update=1 if $_ eq "update"; + $do_ctest=1 if $_ eq "ctest"; $rsaref=1 if $_ eq "rsaref"; if (/^no-rc2$/) { $no_rc2=1; } @@ -59,6 +68,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-hmac$/) { $no_hmac=1; } } + if (!$do_ssl && !$do_crypto) { print STDERR "usage: $0 ( ssl | crypto ) [ 16 | 32 | NT ] [rsaref]\n"; @@ -70,9 +80,9 @@ $max_ssl = $max_num; %crypto_list=&load_numbers($crypto_num); $max_crypto = $max_num; -$ssl="ssl/ssl.h"; +my $ssl="ssl/ssl.h"; -$crypto ="crypto/crypto.h"; +my $crypto ="crypto/crypto.h"; $crypto.=" crypto/des/des.h" unless $no_des; $crypto.=" crypto/idea/idea.h" unless $no_idea; $crypto.=" crypto/rc4/rc4.h" unless $no_rc4; @@ -115,8 +125,8 @@ $crypto.=" crypto/rand/rand.h"; $crypto.=" crypto/comp/comp.h"; $crypto.=" crypto/tmdiff.h"; -@ssl_func = &do_defs("SSLEAY", $ssl); -@crypto_func = &do_defs("LIBEAY", $crypto); +my @ssl_func = &do_defs("SSLEAY", $ssl); +my @crypto_func = &do_defs("LIBEAY", $crypto); if ($do_update) { @@ -131,7 +141,26 @@ if($do_crypto == 1) { open(OUT, ">>$crypto_num"); &update_numbers(*OUT,"LIBEAY",*crypto_list,$max_crypto, @crypto_func); close OUT; -} +} + +} elsif ($do_ctest) { + + print <<"EOF"; + +/* Test file to check all DEF file symbols are present by trying + * to link to all of them. This is *not* intended to be run! + */ + +int main() +{ +EOF + &print_test_file(*STDOUT,"SSLEAY",*ssl_list,@ssl_func) + if $do_ssl == 1; + + &print_test_file(*STDOUT,"LIBEAY",*crypto_list,@crypto_func) + if $do_crypto == 1; + + print "}\n"; } else { @@ -147,14 +176,15 @@ if($do_crypto == 1) { sub do_defs { my($name,$files)=@_; + my $file; my @ret; my %funcs; + my $cpp; foreach $file (split(/\s+/,$files)) { open(IN,"<$file") || die "unable to open $file:$!\n"; - - my $line = "", $def= ""; + my $line = "", my $def= ""; my %tag = ( FreeBSD => 0, NOPROTO => 0, @@ -164,6 +194,22 @@ sub do_defs NO_FP_API => 0, CONST_STRICT => 0, TRUE => 1, + NO_RC2 => 0, + NO_RC4 => 0, + NO_RC5 => 0, + NO_IDEA => 0, + NO_DES => 0, + NO_BF => 0, + NO_CAST => 0, + NO_MD2 => 0, + NO_MD5 => 0, + NO_SHA => 0, + NO_RIPEMD => 0, + NO_MDC2 => 0, + NO_RSA => 0, + NO_DSA => 0, + NO_DH => 0, + NO_HMAC => 0, ); while(<IN>) { last if (/BEGIN ERROR CODES/); @@ -214,6 +260,11 @@ sub do_defs push(@tag,"TRUE"); $tag{"TRUE"}=1; next; + } elsif (/^\#\s*if\s+0/) { + # Dummy tag + push(@tag,"TRUE"); + $tag{"TRUE"}=-1; + next; } elsif (/^\#/) { next; } @@ -250,7 +301,20 @@ sub do_defs } $funcs{"PEM_read_bio_${1}"} = 1; $funcs{"PEM_write_bio_${1}"} = 1; - } elsif ( + } elsif (/^DECLARE_PEM_write\s*\(\s*(\w*)\s*,/ || + /^DECLARE_PEM_write_cb\s*\(\s*(\w*)\s*,/ ) { + if($W32) { + $funcs{"PEM_write_${1}"} = 1; + } + $funcs{"PEM_write_bio_${1}"} = 1; + } elsif (/^DECLARE_PEM_read\s*\(\s*(\w*)\s*,/ || + /^DECLARE_PEM_read_cb\s*\(\s*(\w*)\s*,/ ) { + if($W32) { + $funcs{"PEM_read_${1}"} = 1; + } + $funcs{"PEM_read_bio_${1}"} = 1; + } elsif ( + ($tag{'TRUE'} != -1) && ($tag{'FreeBSD'} != 1) && ($tag{'CONST_STRICT'} != 1) && (($W32 && ($tag{'WIN16'} != 1)) || @@ -260,7 +324,23 @@ sub do_defs ((!$W32 && $tag{'_WINDLL'} != -1) || ($W32 && $tag{'_WINDLL'} != 1)) && ((($tag{'NO_FP_API'} != 1) && $W32) || - (($tag{'NO_FP_API'} != -1) && !$W32))) + (($tag{'NO_FP_API'} != -1) && !$W32)) && + ($tag{'NO_RC2'} == 0 || !$no_rc2) && + ($tag{'NO_RC4'} == 0 || !$no_rc4) && + ($tag{'NO_RC5'} == 0 || !$no_rc5) && + ($tag{'NO_IDEA'} == 0 || !$no_idea) && + ($tag{'NO_DES'} == 0 || !$no_des) && + ($tag{'NO_BF'} == 0 || !$no_bf) && + ($tag{'NO_CAST'} == 0 || !$no_cast) && + ($tag{'NO_MD2'} == 0 || !$no_md2) && + ($tag{'NO_MD5'} == 0 || !$no_md5) && + ($tag{'NO_SHA'} == 0 || !$no_sha) && + ($tag{'NO_RIPEMD'} == 0 || !$no_ripemd) && + ($tag{'NO_MDC2'} == 0 || !$no_mdc2) && + ($tag{'NO_RSA'} == 0 || !$no_rsa) && + ($tag{'NO_DSA'} == 0 || !$no_dsa) && + ($tag{'NO_DH'} == 0 || !$no_dh) && + ($tag{'NO_HMAC'} == 0 || !$no_hmac)) { if (/{|\/\*/) { # } $line = $_; @@ -309,8 +389,8 @@ sub do_defs # Prune the returned functions delete $funcs{"SSL_add_dir_cert_subjects_to_stack"}; - delete $funcs{"des_crypt"}; delete $funcs{"RSA_PKCS1_RSAref"} unless $rsaref; + delete $funcs{"bn_dump1"}; if($W32) { delete $funcs{"BIO_s_file_internal"}; @@ -334,10 +414,31 @@ sub do_defs return(@ret); } +sub print_test_file +{ + (*OUT,my $name,*nums,my @functions)=@_; + my $n = 1; my @e; my @r; + my $func; + + (@e)=grep(/^SSLeay/,@functions); + (@r)=grep(!/^SSLeay/,@functions); + @functions=((sort @e),(sort @r)); + + foreach $func (@functions) { + if (!defined($nums{$func})) { + printf STDERR "$func does not have a number assigned\n" + if(!$do_update); + } else { + $n=$nums{$func}; + print OUT "\t$func();\n"; + } + } +} + sub print_def_file { - (*OUT,my $name,*nums,@functions)=@_; - my $n =1; + (*OUT,my $name,*nums,my @functions)=@_; + my $n = 1; my @e; my @r; if ($W32) { $name.="32"; } diff --git a/crypto/openssl/util/mkerr.pl b/crypto/openssl/util/mkerr.pl index 4b3bccb13e74..8e18f3c2dff8 100644 --- a/crypto/openssl/util/mkerr.pl +++ b/crypto/openssl/util/mkerr.pl @@ -284,6 +284,17 @@ EOF # Rewrite the C source file containing the error details. + # First, read any existing reason string definitions: + my %err_reason_strings; + if (open(IN,"<$cfile")) { + while (<IN>) { + if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) { + $err_reason_strings{$1} = $2; + } + } + close(IN); + } + my $hincf; if($static) { $hfile =~ /([^\/]+)$/; @@ -352,7 +363,8 @@ EOF */ /* NOTE: this file was auto generated by the mkerr.pl script: any changes - * made to it will be overwritten when the script next updates this file. + * made to it will be overwritten when the script next updates this file, + * only reason strings will be preserved. */ #include <stdio.h> @@ -385,9 +397,13 @@ EOF foreach $i (@reasons) { my $rn; my $nspc = 0; - $i =~ /^${lib}_R_(\S+)$/; - $rn = $1; - $rn =~ tr/_[A-Z]/ [a-z]/; + if (exists $err_reason_strings{$i}) { + $rn = $err_reason_strings{$i}; + } else { + $i =~ /^${lib}_R_(\S+)$/; + $rn = $1; + $rn =~ tr/_[A-Z]/ [a-z]/; + } $nspc = 40 - length($i) unless length($i) > 40; $nspc = " " x $nspc; print OUT "{${i}${nspc},\"$rn\"},\n"; @@ -450,7 +466,7 @@ void ERR_load_${lib}_strings(void) #ifdef ${lib}_LIB_NAME ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0); ERR_load_strings(0,${lib}_lib_name); -#endif; +#endif } } @@ -465,7 +481,7 @@ EOF } close OUT; - + undef %err_reason_strings; } if($debug && defined(%notrans)) { diff --git a/crypto/openssl/util/pl/BC-32.pl b/crypto/openssl/util/pl/BC-32.pl index 09c45a21a6be..7f57809a165f 100644 --- a/crypto/openssl/util/pl/BC-32.pl +++ b/crypto/openssl/util/pl/BC-32.pl @@ -19,7 +19,7 @@ $out_def="out32"; $tmp_def="tmp32"; $inc_def="inc32"; #enable max error messages, disable most common warnings -$cflags="-DWIN32_LEAN_AND_MEAN -j255 -w-aus -w-par -w-inl -c -tWC -tWM -DWINDOWS -DWIN32 -DL_ENDIAN "; +$cflags="-DWIN32_LEAN_AND_MEAN -q -w-aus -w-par -w-inl -c -tWC -tWM -DWINDOWS -DWIN32 -DL_ENDIAN "; if ($debug) { $cflags.="-Od -y -v -vi- -D_DEBUG"; @@ -109,7 +109,7 @@ sub do_lib_rule { # $ret.="\t\$(RM) \$(O_$Name)\n"; $ret.="\techo LIB $<\n"; - $ret.="\t\$(MKLIB) $lfile$target \$(addprefix +, $objs)\n"; + $ret.="\t&\$(MKLIB) $lfile$target -+\$**\n"; } else { diff --git a/crypto/openssl/util/pl/Mingw32.pl b/crypto/openssl/util/pl/Mingw32.pl index 84c2a22db304..2d33c91a0184 100644 --- a/crypto/openssl/util/pl/Mingw32.pl +++ b/crypto/openssl/util/pl/Mingw32.pl @@ -1,6 +1,7 @@ #!/usr/local/bin/perl # # Mingw32.pl -- Mingw32 with GNU cp (Mingw32f.pl uses DOS tools) +# $FreeBSD$ # $o='/'; diff --git a/crypto/openssl/util/pl/VC-32.pl b/crypto/openssl/util/pl/VC-32.pl index 6db1c9fe2374..046f0e253c39 100644 --- a/crypto/openssl/util/pl/VC-32.pl +++ b/crypto/openssl/util/pl/VC-32.pl @@ -22,7 +22,7 @@ $inc_def="inc32"; if ($debug) { - $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWINDOWS -DWIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG"; + $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG"; $lflags.=" /debug"; $mlflags.=' /debug'; } diff --git a/crypto/openssl/util/ssleay.num b/crypto/openssl/util/ssleay.num index 8121738bd674..32b2e960c4aa 100755 --- a/crypto/openssl/util/ssleay.num +++ b/crypto/openssl/util/ssleay.num @@ -215,3 +215,13 @@ SSL_CTX_set_cert_verify_callback 232 sk_SSL_COMP_sort 233 sk_SSL_CIPHER_sort 234 SSL_CTX_set_default_passwd_cb_userdata 235 +SSL_set_purpose 236 +SSL_CTX_set_trust 237 +SSL_CTX_set_purpose 238 +SSL_set_trust 239 +SSL_get_finished 240 +SSL_get_peer_finished 241 +SSL_get1_session 242 +SSL_CTX_callback_ctrl 243 +SSL_callback_ctrl 244 +SSL_CTX_sessions 245 |