Change the trust and purpose code so it doesn't need init

either and has a static and dynamic mix.

1 files changed, 229 insertions, 237 deletions

diff --git a/util/libeay.num b/util/libeay.num
index a14719d529..bf3d063636 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1883,241 +1883,233 @@ DISPLAYTEXT_new                         1907
 ASN1_GENERALIZEDTIME_free               1908
 X509V3_REVOKED_get_d2i                  1909
 X509_set_ex_data                        1910
-X509_PURPOSE_add_standard               1911
-sk_X509_PURPOSE_value                   1912
-sk_X509_PURPOSE_zero                    1913
-ASN1_VISIBLESTRING_new                  1914
-ASN1_PRINTABLESTRING_free               1915
-ASN1_BMPSTRING_new                      1916
-ASN1_UTF8STRING_new                     1917
-sk_X509_PURPOSE_pop                     1918
-DSA_get_default_method                  1919
-sk_X509_PURPOSE_push                    1920
-sk_X509_PURPOSE_delete                  1921
-sk_X509_PURPOSE_num                     1922
-PEM_read_DSA_PUBKEY                     1923
-ASN1_T61STRING_free                     1924
-d2i_DSA_PUBKEY_fp                       1925
-DSA_set_method                          1926
-X509_get_ex_data                        1927
-ASN1_STRING_type                        1928
-sk_X509_PURPOSE_find                    1929
-ASN1_TIME_free                          1930
-ASN1_OCTET_STRING_cmp                   1931
-ASN1_BIT_STRING_new                     1932
-X509V3_X509_get_d2i                     1933
-ASN1_INTEGER_cmp                        1934
-ASN1_TIME_new                           1935
-d2i_DSA_PUBKEY_bio                      1936
-sk_X509_PURPOSE_new_null                1937
-ASN1_UTCTIME_free                       1938
-DSA_set_default_method                  1939
-sk_X509_PURPOSE_set_cmp_func            1940
-PEM_write_bio_DSA_PUBKEY                1941
-X509_PURPOSE_get_by_id                  1942
-DISPLAYTEXT_free                        1943
-X509V3_CRL_get_d2i                      1944
-ASN1_OCTET_STRING_free                  1945
-X509_get_ex_new_index                   1946
-ASN1_STRING_length                      1947
-ASN1_PRINTABLESTRING_new                1948
-X509V3_get_d2i                          1949
-ASN1_ENUMERATED_free                    1950
-sk_X509_PURPOSE_unshift                 1951
-sk_X509_PURPOSE_set                     1952
-sk_X509_PURPOSE_sort                    1953
-DIRECTORYSTRING_free                    1954
-ASN1_OCTET_STRING_set                   1955
-ASN1_IA5STRING_new                      1956
-X509_check_purpose                      1957
-ASN1_ENUMERATED_new                     1958
-PEM_write_DSA_PUBKEY                    1959
-ASN1_BMPSTRING_free                     1960
-ASN1_T61STRING_new                      1961
-ASN1_UTCTIME_new                        1962
-ASN1_IA5STRING_free                     1963
-ASN1_STRING_data                        1964
-X509_PURPOSE_iget_name                  1965
-sk_X509_PURPOSE_delete_ptr              1966
-ASN1_BIT_STRING_free                    1967
-X509_PURPOSE_add                        1968
-ASN1_UTF8STRING_free                    1969
-X509_PURPOSE_get                        1970
-sk_X509_PURPOSE_pop_free                1971
-i2d_DSA_PUBKEY_fp                       1972
-sk_X509_PURPOSE_free                    1973
-sk_X509_PURPOSE_dup                     1974
-ASN1_OCTET_STRING_dup                   1975
-ASN1_BIT_STRING_set                     1976
-ASN1_INTEGER_free                       1977
-ASN1_INTEGER_dup                        1978
-ASN1_VISIBLESTRING_free                 1979
-sk_X509_PURPOSE_shift                   1980
-sk_X509_PURPOSE_new                     1981
-sk_X509_PURPOSE_insert                  1982
-ASN1_GENERALIZEDTIME_new                1983
-PEM_read_bio_DSA_PUBKEY                 1984
-ASN1_OCTET_STRING_new                   1985
-ASN1_INTEGER_new                        1986
-i2d_DSA_PUBKEY_bio                      1987
-ASN1_STRING_length_set                  1988
-DIRECTORYSTRING_new                     1989
-ASN1_mbstring_copy                      1990
-sk_ASN1_STRING_TABLE_value              1991
-sk_ASN1_STRING_TABLE_pop                1992
-sk_ASN1_STRING_TABLE_num                1993
-sk_ASN1_STRING_TABLE_delete_ptr         1994
-sk_ASN1_STRING_TABLE_sort               1995
+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_iget                       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_PURPOSE_add_standard               1928
+sk_X509_PURPOSE_value                   1929
+sk_X509_PURPOSE_zero                    1930
+X509_TRUST_add                          1931
+ASN1_VISIBLESTRING_new                  1932
+X509_alias_set                          1933
+ASN1_PRINTABLESTRING_free               1934
+EVP_PKEY_rget_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
+X509V3_X509_get_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_rset_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
-sk_ASN1_STRING_TABLE_pop_free           1997
-sk_ASN1_STRING_TABLE_unshift            1998
-ASN1_STRING_TABLE_cleanup               1999
-ASN1_STRING_set_default_mask            2000
-sk_ASN1_STRING_TABLE_insert             2001
-sk_ASN1_STRING_TABLE_free               2002
-sk_ASN1_STRING_TABLE_set                2003
-ASN1_STRING_TABLE_add_standard          2004
-sk_ASN1_STRING_TABLE_set_cmp_func       2005
-ASN1_STRING_get_default_mask            2006
-ASN1_STRING_TABLE_get                   2007
-sk_ASN1_STRING_TABLE_delete             2008
-sk_ASN1_STRING_TABLE_zero               2009
-sk_ASN1_STRING_TABLE_shift              2010
-sk_ASN1_STRING_TABLE_new_null           2011
-sk_ASN1_STRING_TABLE_push               2012
-sk_ASN1_STRING_TABLE_dup                2013
-ASN1_mbstring_ncopy                     2014
-sk_ASN1_STRING_TABLE_find               2015
-sk_ASN1_STRING_TABLE_new                2016
-EVP_PKEY_rget_RSA                       2017
-EVP_PKEY_rget_DH                        2018
-EVP_PKEY_rget_DSA                       2019
-X509_PURPOSE_cleanup                    2020
-ASN1_STRING_set_default_mask_asc        2021
-X509_NAME_add_entry_by_txt              2022
-X509_NAME_add_entry_by_NID              2023
-X509_NAME_add_entry_by_OBJ              2024
-X509_NAME_ENTRY_create_by_txt           2025
-PEM_read_X509_AUX                       2026
-X509_CERT_AUX_free                      2027
-X509_alias_set                          2028
-PEM_read_bio_X509_AUX                   2029
-X509_trust_set_bit_asc                  2030
-d2i_X509_AUX                            2031
-X509_CERT_AUX_print                     2032
-ASN1_BIT_STRING_num_asc                 2033
-X509_CERT_AUX_new                       2034
-ASN1_BIT_STRING_set_asc                 2035
-i2d_X509_CERT_AUX                       2036
-PEM_write_X509_AUX                      2037
-X509_notrust_set_bit                    2038
-X509_add_notrust_object                 2039
-PEM_write_bio_X509_AUX                  2040
-X509_alias_get                          2041
-X509_trust_set_bit                      2042
-d2i_X509_CERT_AUX                       2043
-X509_notrust_set_bit_asc                2044
-i2d_X509_AUX                            2045
-ASN1_BIT_STRING_name_print              2046
-X509_add_trust_object                   2047
-OTHERNAME_new                           2048
-i2d_OTHERNAME                           2049
-CRYPTO_add_info                         2050
-d2i_OTHERNAME                           2051
-OTHERNAME_free                          2052
-X509_cmp                                2053
-PEM_write_PUBKEY                        2054
-PEM_write_bio_RSA_PUBKEY                2055
-d2i_RSA_PUBKEY_fp                       2056
-EVP_PKEY_rset_DSA                       2057
-X509_load_cert_crl_file                 2058
-i2d_RSA_PUBKEY                          2059
-PEM_read_RSA_PUBKEY                     2060
-i2d_DSA_PUBKEY                          2061
-i2d_RSA_PUBKEY_bio                      2062
-i2d_PUBKEY                              2063
-PEM_read_bio_PUBKEY                     2064
-PEM_read_PUBKEY                         2065
-d2i_RSA_PUBKEY                          2066
-d2i_DSA_PUBKEY                          2067
-d2i_RSA_PUBKEY_bio                      2068
-d2i_PUBKEY                              2069
-EVP_PKEY_rset_RSA                       2070
-PEM_read_bio_RSA_PUBKEY                 2071
-PEM_write_RSA_PUBKEY                    2072
-EVP_PKEY_rset_DH                        2073
-i2d_RSA_PUBKEY_fp                       2074
-PEM_write_bio_PUBKEY                    2075
-sk_ACCESS_DESCRIPTION_shift             2076
-d2i_AUTHORITY_INFO_ACCESS               2077
-sk_ACCESS_DESCRIPTION_delete            2078
-ACCESS_DESCRIPTION_new                  2079
-d2i_ACCESS_DESCRIPTION                  2080
-sk_ACCESS_DESCRIPTION_set               2081
-i2d_ASN1_SET_OF_ACCESS_DESCRIPTION      2082
-sk_ACCESS_DESCRIPTION_free              2083
-sk_ACCESS_DESCRIPTION_value             2084
-sk_ACCESS_DESCRIPTION_unshift           2085
-sk_ACCESS_DESCRIPTION_pop_free          2086
-ACCESS_DESCRIPTION_free                 2087
-sk_ACCESS_DESCRIPTION_dup               2088
-sk_ACCESS_DESCRIPTION_zero              2089
-sk_ACCESS_DESCRIPTION_new               2090
-sk_ACCESS_DESCRIPTION_push              2091
-d2i_ASN1_SET_OF_ACCESS_DESCRIPTION      2092
-sk_ACCESS_DESCRIPTION_find              2093
-AUTHORITY_INFO_ACCESS_free              2094
-sk_ACCESS_DESCRIPTION_pop               2095
-i2d_AUTHORITY_INFO_ACCESS               2096
-sk_ACCESS_DESCRIPTION_num               2097
-i2d_ACCESS_DESCRIPTION                  2098
-sk_ACCESS_DESCRIPTION_new_null          2099
-sk_ACCESS_DESCRIPTION_delete_ptr        2100
-sk_ACCESS_DESCRIPTION_insert            2101
-sk_ACCESS_DESCRIPTION_sort              2102
-sk_ACCESS_DESCRIPTION_set_cmp_func      2103
-sk_X509_TRUST_pop                       2104
-X509_cleanup                            2105
-sk_X509_TRUST_set_cmp_func              2106
-X509_PURPOSE_get_by_sname               2107
-X509_STORE_CTX_free                     2108
-sk_X509_TRUST_pop_free                  2109
-X509_STORE_CTX_purpose_inherit          2110
-sk_X509_TRUST_push                      2111
-X509_PURPOSE_get_id                     2112
-sk_X509_TRUST_find                      2113
-X509_TRUST_get_id                       2114
-X509_TRUST_iget_name                    2115
-X509_TRUST_iget                         2116
-sk_X509_TRUST_unshift                   2117
-X509_PURPOSE_get_count                  2118
-X509_add_reject_object                  2119
-sk_X509_TRUST_new_null                  2120
-sk_X509_TRUST_new                       2121
-sk_X509_TRUST_delete_ptr                2122
-X509_PURPOSE_iget_sname                 2123
-X509_TRUST_get_count                    2124
-X509_reject_set_bit_asc                 2125
-X509_PURPOSE_iget                       2126
-sk_X509_TRUST_free                      2127
-sk_X509_TRUST_num                       2128
-X509_init                               2129
-X509_TRUST_add                          2130
-X509_TRUST_add_standard                 2131
-sk_X509_TRUST_zero                      2132
-sk_X509_TRUST_shift                     2133
-X509_TRUST_cleanup                      2134
-sk_X509_TRUST_set                       2135
-X509_TRUST_get_by_id                    2136
-X509_PURPOSE_get_trust                  2137
-X509_STORE_CTX_set_trust                2138
-X509_STORE_CTX_new                      2139
-sk_X509_TRUST_value                     2140
-X509_TRUST_get_trust                    2141
-X509_STORE_CTX_set_purpose              2142
-sk_X509_TRUST_dup                       2143
-sk_X509_TRUST_insert                    2144
-X509_check_trust                        2145
-sk_X509_TRUST_sort                      2146
-X509_reject_set_bit                     2147
-sk_X509_TRUST_delete                    2148
+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
+X509V3_CRL_get_d2i                      2009
+sk_X509_TRUST_set                       2010
+X509_PURPOSE_iget_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_rget_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_iget_name                    2046
+X509_TRUST_iget                         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_rset_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_get                          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_add_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_iget_sname                 2105
+sk_ASN1_STRING_TABLE_shift              2106
+EVP_PKEY_rset_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_rget_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_add_trust_object                   2140