make update

diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl
index 82432bd037fb13b01d4451369d714dadb01084f2..8a97b62784e153e262ecf760eaec781dc56e7add 100644 (file)
--- a/crypto/engine/Makefile.ssl
+++ b/crypto/engine/Makefile.ssl
@@ -252,6 +252,25 @@ eng_table.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
 eng_table.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 eng_table.o: eng_int.h eng_table.c
 eng_table.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 eng_table.o: eng_int.h eng_table.c

+hw_4758_cca.o: ../../e_os.h ../../include/openssl/asn1.h
+hw_4758_cca.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+hw_4758_cca.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+hw_4758_cca.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+hw_4758_cca.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
+hw_4758_cca.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+hw_4758_cca.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+hw_4758_cca.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+hw_4758_cca.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+hw_4758_cca.o: ../../include/openssl/objects.h
+hw_4758_cca.o: ../../include/openssl/opensslconf.h
+hw_4758_cca.o: ../../include/openssl/opensslv.h
+hw_4758_cca.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+hw_4758_cca.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+hw_4758_cca.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+hw_4758_cca.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+hw_4758_cca.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+hw_4758_cca.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_4758_cca.c
+hw_4758_cca.o: hw_4758_cca_err.c hw_4758_cca_err.h vendor_defns/hw_4758_cca.h

 hw_aep.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
 hw_aep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 hw_aep.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
 hw_aep.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
 hw_aep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 hw_aep.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h

diff --git a/util/libeay.num b/util/libeay.num
index 8999547a11072f64bc68edffc3f3342f8233efc1..7ce301bc66045126c74510343abc3186277e122c 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2256,7 +2256,8 @@ ASN1_TIME_check                         2782      EXIST::FUNCTION:
 UI_get0_user_data                       2783   EXIST::FUNCTION:
 HMAC_CTX_cleanup                        2784   EXIST::FUNCTION:HMAC
 DSA_up_ref                              2785   EXIST::FUNCTION:DSA
 UI_get0_user_data                       2783   EXIST::FUNCTION:
 HMAC_CTX_cleanup                        2784   EXIST::FUNCTION:HMAC
 DSA_up_ref                              2785   EXIST::FUNCTION:DSA

-_ossl_old_des_ede3_cfb64_encrypt        2786   EXIST::FUNCTION:DES
+_ossl_old_des_ede3_cfb64_encrypt        2786   EXIST:!VMS:FUNCTION:DES
+_ossl_odes_ede3_cfb64_encrypt           2786   EXIST:VMS:FUNCTION:DES

 ASN1_BMPSTRING_it                       2787   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_BMPSTRING_it                       2787   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ASN1_tag2bit                            2788   EXIST::FUNCTION:
 ASN1_BMPSTRING_it                       2787   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_BMPSTRING_it                       2787   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ASN1_tag2bit                            2788   EXIST::FUNCTION:


@@ -2526,7 +2527,8 @@ ENGINE_get_cipher_engine                3008      EXIST::FUNCTION:
 ENGINE_register_all_ciphers             3009   EXIST::FUNCTION:
 EC_POINT_copy                           3010   EXIST::FUNCTION:EC
 BN_kronecker                            3011   EXIST::FUNCTION:
 ENGINE_register_all_ciphers             3009   EXIST::FUNCTION:
 EC_POINT_copy                           3010   EXIST::FUNCTION:EC
 BN_kronecker                            3011   EXIST::FUNCTION:

-_ossl_old_des_ede3_ofb64_encrypt        3012   EXIST::FUNCTION:DES
+_ossl_old_des_ede3_ofb64_encrypt        3012   EXIST:!VMS:FUNCTION:DES
+_ossl_odes_ede3_ofb64_encrypt           3012   EXIST:VMS:FUNCTION:DES

 UI_method_get_reader                    3013   EXIST::FUNCTION:
 OCSP_BASICRESP_get_ext_count            3014   EXIST::FUNCTION:
 ASN1_ENUMERATED_it                      3015   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 UI_method_get_reader                    3013   EXIST::FUNCTION:
 OCSP_BASICRESP_get_ext_count            3014   EXIST::FUNCTION:
 ASN1_ENUMERATED_it                      3015   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:


@@ -2762,79 +2764,82 @@ UI_UTIL_read_pw                         3208    EXIST::FUNCTION:
 UI_UTIL_read_pw_string                  3209   EXIST::FUNCTION:
 ENGINE_load_aep                         3210   EXIST::FUNCTION:
 ENGINE_load_sureware                    3211   EXIST::FUNCTION:
 UI_UTIL_read_pw_string                  3209   EXIST::FUNCTION:
 ENGINE_load_aep                         3210   EXIST::FUNCTION:
 ENGINE_load_sureware                    3211   EXIST::FUNCTION:

-OPENSSL_add_all_algorithms_noconf       3212   EXIST::FUNCTION:
-OPENSSL_add_all_algorithms_conf         3213   EXIST::FUNCTION:
+OPENSSL_add_all_algorithms_noconf       3212   EXIST:!VMS:FUNCTION:
+OPENSSL_add_all_algo_noconf             3212   EXIST:VMS:FUNCTION:
+OPENSSL_add_all_algorithms_conf         3213   EXIST:!VMS:FUNCTION:
+OPENSSL_add_all_algo_conf               3213   EXIST:VMS:FUNCTION:

 OPENSSL_load_builtin_modules            3214   EXIST::FUNCTION:
 AES_ofb128_encrypt                      3215   EXIST::FUNCTION:AES
 AES_ctr128_encrypt                      3216   EXIST::FUNCTION:AES
 AES_cfb128_encrypt                      3217   EXIST::FUNCTION:AES
 OPENSSL_load_builtin_modules            3214   EXIST::FUNCTION:
 AES_ofb128_encrypt                      3215   EXIST::FUNCTION:AES
 AES_ctr128_encrypt                      3216   EXIST::FUNCTION:AES
 AES_cfb128_encrypt                      3217   EXIST::FUNCTION:AES

-EC_GROUP_new_by_name                    3218   EXIST::FUNCTION:EC
-d2i_ECDSA_PUBKEY                        3219   EXIST::FUNCTION:ECDSA
-PEM_read_bio_ECDSAPrivateKey            3220   EXIST::FUNCTION:ECDSA
-ECDSA_SIG_new                           3221   EXIST::FUNCTION:ECDSA
-ECDSA_verify                            3222   EXIST::FUNCTION:ECDSA
-i2d_ECDSAParameters                     3223   EXIST::FUNCTION:ECDSA
-i2d_ECDSAPrivateKey_bio                 3224   EXIST::FUNCTION:BIO,ECDSA
-PEM_write_bio_ECDSAParameters           3225   EXIST::FUNCTION:ECDSA
-ECDSAParameters_print_fp                3226   EXIST::FUNCTION:ECDSA,FP_API
-ENGINE_set_default_ECDSA                3227   EXIST::FUNCTION:
-PEM_read_bio_ECDSA_PUBKEY               3228   EXIST::FUNCTION:ECDSA
-ECDSA_check_key                         3229   EXIST::FUNCTION:ECDSA
-ECDSA_new_method                        3230   EXIST::FUNCTION:ECDSA
-d2i_ECDSAPrivateKey_bio                 3231   EXIST::FUNCTION:BIO,ECDSA
-i2d_ECDSA_PUBKEY                        3232   EXIST::FUNCTION:ECDSA
-i2d_ECDSA_PUBKEY_fp                     3233   EXIST::FUNCTION:ECDSA,FP_API
-ENGINE_unregister_ECDSA                 3234   EXIST::FUNCTION:
-ECDSA_free                              3235   EXIST::FUNCTION:ECDSA
-ECDSAParameters_print                   3236   EXIST::FUNCTION:BIO,ECDSA
-PEM_write_bio_ECDSA_PUBKEY              3237   EXIST::FUNCTION:ECDSA
-ECDSA_set_method                        3238   EXIST::FUNCTION:ECDSA
-ECDSA_print                             3239   EXIST::FUNCTION:BIO,ECDSA
-EVP_PKEY_get1_ECDSA                     3240   EXIST::FUNCTION:ECDSA
-ECDSA_SIG_free                          3241   EXIST::FUNCTION:ECDSA
-ECDSA_get_default_openssl_method        3242   EXIST::FUNCTION:ECDSA
-ENGINE_get_default_ECDSA                3243   EXIST::FUNCTION:
-PEM_write_ECDSAPrivateKey               3244   EXIST:!WIN16:FUNCTION:ECDSA
-ECDSA_sign_setup                        3245   EXIST::FUNCTION:ECDSA
-ENGINE_get_ECDSA                        3246   EXIST::FUNCTION:
-d2i_ECDSA_PUBKEY_bio                    3247   EXIST::FUNCTION:BIO,ECDSA
-ECDSA_sign                              3248   EXIST::FUNCTION:ECDSA
-ENGINE_register_ECDSA                   3249   EXIST::FUNCTION:
-d2i_ECDSAPrivateKey_fp                  3250   EXIST::FUNCTION:ECDSA,FP_API
-ECDSA_print_fp                          3251   EXIST::FUNCTION:ECDSA,FP_API
-i2d_ECDSAPrivateKey                     3252   EXIST::FUNCTION:ECDSA
-d2i_ECDSAParameters                     3253   EXIST::FUNCTION:ECDSA
-d2i_ECDSAPublicKey                      3254   EXIST::FUNCTION:ECDSA
-PEM_write_bio_ECDSAPrivateKey           3255   EXIST::FUNCTION:ECDSA
-d2i_ECDSA_SIG                           3256   EXIST::FUNCTION:ECDSA
-ECDSA_size                              3257   EXIST::FUNCTION:ECDSA
-EC_GROUP_set_nid                        3258   EXIST::FUNCTION:EC
-EVP_PKEY_set1_ECDSA                     3259   EXIST::FUNCTION:ECDSA
-EC_GROUP_get_nid                        3260   EXIST::FUNCTION:EC
-d2i_ECDSA_PUBKEY_fp                     3261   EXIST::FUNCTION:ECDSA,FP_API
-ECDSA_OpenSSL                           3262   EXIST::FUNCTION:ECDSA
-ECDSA_get_parameter_flags               3263   EXIST::FUNCTION:ECDSA
-PEM_read_ECDSAParameters                3264   EXIST:!WIN16:FUNCTION:ECDSA
-ECDSA_get_ex_data                       3265   EXIST::FUNCTION:ECDSA
-ECDSA_do_verify                         3266   EXIST::FUNCTION:ECDSA
-ECDSA_do_sign                           3267   EXIST::FUNCTION:ECDSA
-ECDSA_set_parameter_flags               3268   EXIST::FUNCTION:ECDSA
-i2d_ECDSA_SIG                           3269   EXIST::FUNCTION:ECDSA
-PEM_read_bio_ECDSAParameters            3270   EXIST::FUNCTION:ECDSA
-EVP_ecdsa                               3271   EXIST::FUNCTION:SHA
-ECDSA_set_default_method                3272   EXIST::FUNCTION:ECDSA
-ENGINE_set_ECDSA                        3273   EXIST::FUNCTION:
-ECDSA_get_ex_new_index                  3274   EXIST::FUNCTION:ECDSA
-i2d_ECDSAPublicKey                      3275   EXIST::FUNCTION:ECDSA
-PEM_write_ECDSA_PUBKEY                  3276   EXIST:!WIN16:FUNCTION:ECDSA
-ECDSA_set_ex_data                       3277   EXIST::FUNCTION:ECDSA
-i2d_ECDSA_PUBKEY_bio                    3278   EXIST::FUNCTION:BIO,ECDSA
-d2i_ECDSAPrivateKey                     3279   EXIST::FUNCTION:ECDSA
-EC_GROUP_new_by_nid                     3280   EXIST::FUNCTION:EC
-PEM_read_ECDSA_PUBKEY                   3281   EXIST:!WIN16:FUNCTION:ECDSA
-ECDSA_up_ref                            3282   EXIST::FUNCTION:ECDSA
-ENGINE_register_all_ECDSA               3283   EXIST::FUNCTION:
-ECDSA_generate_key                      3284   EXIST::FUNCTION:ECDSA
-PEM_write_ECDSAParameters               3285   EXIST:!WIN16:FUNCTION:ECDSA
-i2d_ECDSAPrivateKey_fp                  3286   EXIST::FUNCTION:ECDSA,FP_API
-PEM_read_ECDSAPrivateKey                3287   EXIST:!WIN16:FUNCTION:ECDSA
+ENGINE_load_4758cca                     3218   EXIST::FUNCTION:
+EC_GROUP_new_by_name                    3219   EXIST::FUNCTION:EC
+d2i_ECDSA_PUBKEY                        3220   EXIST::FUNCTION:ECDSA
+PEM_read_bio_ECDSAPrivateKey            3221   EXIST::FUNCTION:ECDSA
+ECDSA_SIG_new                           3222   EXIST::FUNCTION:ECDSA
+ECDSA_verify                            3223   EXIST::FUNCTION:ECDSA
+i2d_ECDSAParameters                     3224   EXIST::FUNCTION:ECDSA
+i2d_ECDSAPrivateKey_bio                 3225   EXIST::FUNCTION:BIO,ECDSA
+PEM_write_bio_ECDSAParameters           3226   EXIST::FUNCTION:ECDSA
+ECDSAParameters_print_fp                3227   EXIST::FUNCTION:ECDSA,FP_API
+ENGINE_set_default_ECDSA                3228   EXIST::FUNCTION:
+PEM_read_bio_ECDSA_PUBKEY               3229   EXIST::FUNCTION:ECDSA
+ECDSA_check_key                         3230   EXIST::FUNCTION:ECDSA
+ECDSA_new_method                        3231   EXIST::FUNCTION:ECDSA
+d2i_ECDSAPrivateKey_bio                 3232   EXIST::FUNCTION:BIO,ECDSA
+i2d_ECDSA_PUBKEY                        3233   EXIST::FUNCTION:ECDSA
+i2d_ECDSA_PUBKEY_fp                     3234   EXIST::FUNCTION:ECDSA,FP_API
+ENGINE_unregister_ECDSA                 3235   EXIST::FUNCTION:
+ECDSA_free                              3236   EXIST::FUNCTION:ECDSA
+ECDSAParameters_print                   3237   EXIST::FUNCTION:BIO,ECDSA
+PEM_write_bio_ECDSA_PUBKEY              3238   EXIST::FUNCTION:ECDSA
+ECDSA_set_method                        3239   EXIST::FUNCTION:ECDSA
+ECDSA_print                             3240   EXIST::FUNCTION:BIO,ECDSA
+EVP_PKEY_get1_ECDSA                     3241   EXIST::FUNCTION:ECDSA
+ECDSA_SIG_free                          3242   EXIST::FUNCTION:ECDSA
+ECDSA_get_default_openssl_method        3243   EXIST::FUNCTION:ECDSA
+ENGINE_get_default_ECDSA                3244   EXIST::FUNCTION:
+PEM_write_ECDSAPrivateKey               3245   EXIST:!WIN16:FUNCTION:ECDSA
+ECDSA_sign_setup                        3246   EXIST::FUNCTION:ECDSA
+ENGINE_get_ECDSA                        3247   EXIST::FUNCTION:
+d2i_ECDSA_PUBKEY_bio                    3248   EXIST::FUNCTION:BIO,ECDSA
+ECDSA_sign                              3249   EXIST::FUNCTION:ECDSA
+ENGINE_register_ECDSA                   3250   EXIST::FUNCTION:
+d2i_ECDSAPrivateKey_fp                  3251   EXIST::FUNCTION:ECDSA,FP_API
+ECDSA_print_fp                          3252   EXIST::FUNCTION:ECDSA,FP_API
+i2d_ECDSAPrivateKey                     3253   EXIST::FUNCTION:ECDSA
+d2i_ECDSAParameters                     3254   EXIST::FUNCTION:ECDSA
+d2i_ECDSAPublicKey                      3255   EXIST::FUNCTION:ECDSA
+PEM_write_bio_ECDSAPrivateKey           3256   EXIST::FUNCTION:ECDSA
+d2i_ECDSA_SIG                           3257   EXIST::FUNCTION:ECDSA
+ECDSA_size                              3258   EXIST::FUNCTION:ECDSA
+EC_GROUP_set_nid                        3259   EXIST::FUNCTION:EC
+EVP_PKEY_set1_ECDSA                     3260   EXIST::FUNCTION:ECDSA
+EC_GROUP_get_nid                        3261   EXIST::FUNCTION:EC
+d2i_ECDSA_PUBKEY_fp                     3262   EXIST::FUNCTION:ECDSA,FP_API
+ECDSA_OpenSSL                           3263   EXIST::FUNCTION:ECDSA
+ECDSA_get_parameter_flags               3264   EXIST::FUNCTION:ECDSA
+PEM_read_ECDSAParameters                3265   EXIST:!WIN16:FUNCTION:ECDSA
+ECDSA_get_ex_data                       3266   EXIST::FUNCTION:ECDSA
+ECDSA_do_verify                         3267   EXIST::FUNCTION:ECDSA
+ECDSA_do_sign                           3268   EXIST::FUNCTION:ECDSA
+ECDSA_set_parameter_flags               3269   EXIST::FUNCTION:ECDSA
+i2d_ECDSA_SIG                           3270   EXIST::FUNCTION:ECDSA
+PEM_read_bio_ECDSAParameters            3271   EXIST::FUNCTION:ECDSA
+EVP_ecdsa                               3272   EXIST::FUNCTION:SHA
+ECDSA_set_default_method                3273   EXIST::FUNCTION:ECDSA
+ENGINE_set_ECDSA                        3274   EXIST::FUNCTION:
+ECDSA_get_ex_new_index                  3275   EXIST::FUNCTION:ECDSA
+i2d_ECDSAPublicKey                      3276   EXIST::FUNCTION:ECDSA
+PEM_write_ECDSA_PUBKEY                  3277   EXIST:!WIN16:FUNCTION:ECDSA
+ECDSA_set_ex_data                       3278   EXIST::FUNCTION:ECDSA
+i2d_ECDSA_PUBKEY_bio                    3279   EXIST::FUNCTION:BIO,ECDSA
+d2i_ECDSAPrivateKey                     3280   EXIST::FUNCTION:ECDSA
+EC_GROUP_new_by_nid                     3281   EXIST::FUNCTION:EC
+PEM_read_ECDSA_PUBKEY                   3282   EXIST:!WIN16:FUNCTION:ECDSA
+ECDSA_up_ref                            3283   EXIST::FUNCTION:ECDSA
+ENGINE_register_all_ECDSA               3284   EXIST::FUNCTION:
+ECDSA_generate_key                      3285   EXIST::FUNCTION:ECDSA
+PEM_write_ECDSAParameters               3286   EXIST:!WIN16:FUNCTION:ECDSA
+i2d_ECDSAPrivateKey_fp                  3287   EXIST::FUNCTION:ECDSA,FP_API
+PEM_read_ECDSAPrivateKey                3288   EXIST:!WIN16:FUNCTION:ECDSA