This commit was generated by cvs2svn to track changes on a CVS vendor

branch.

18 files changed, 903 insertions, 481 deletions

diff --git a/ms/certCA.srl b/ms/certCA.srl
index d6b24041cf..2cfaa3ba20 100644
--- a/ms/certCA.srl
+++ b/ms/certCA.srl
@@ -1 +1 @@
-19
+1D
diff --git a/ms/certCA.ss b/ms/certCA.ss
index 6bfccc7c48..b48c657ae0 100644
--- a/ms/certCA.ss
+++ b/ms/certCA.ss
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
 MIIBXDCCAQYCAQAwDQYJKoZIhvcNAQEEBQAwOTELMAkGA1UEBhMCQVUxFzAVBgNV
-BAoTDkRvZGd5IEJyb3RoZXJzMREwDwYDVQQDEwhEb2RneSBDQTAeFw05NzExMjgw
-MDA3MzBaFw05NzEyMjgwMDA3MzBaMDkxCzAJBgNVBAYTAkFVMRcwFQYDVQQKEw5E
+BAoTDkRvZGd5IEJyb3RoZXJzMREwDwYDVQQDEwhEb2RneSBDQTAeFw05ODA3MjEw
+NjUwMTZaFw05ODA4MjAwNjUwMTZaMDkxCzAJBgNVBAYTAkFVMRcwFQYDVQQKEw5E
 b2RneSBCcm90aGVyczERMA8GA1UEAxMIRG9kZ3kgQ0EwXDANBgkqhkiG9w0BAQEF
-AANLADBIAkEAwOKExbdfKLemEMGOKeBgqI3abJE9yzf3WhrPcQLRAyM85YPxk0DQ
-YWwhEh9i2BxGWYAZ7Krv1EqdsViCQBGuBQIDAQABMA0GCSqGSIb3DQEBBAUAA0EA
-VXYhZ1FnfBFIjHiYV8PD4uQuVJLhNa2q3cSWX1HTHfbrAPa/lMSUWuWcYwD3lBeb
-D69W77B0LqAfVajBQwbXkQ==
+AANLADBIAkEA0DQLenM/ncK6CwSEJhOO1WfZUPUEi4pvos9fHW459jh3rRDADgi3
+fiCYxoRVSQhvB47kDZ3ViNg5yrDhy7F9ywIDAQABMA0GCSqGSIb3DQEBBAUAA0EA
+S564l3SBxJ+QcIXthGGDyP5zkxTf/1fHfelW9LNgu6lZTdy9Dlp/NecPekzRmZEM
+WiGXGkKNeuo8PsnGJHP9Qg==
 -----END CERTIFICATE-----
diff --git a/ms/certU.ss b/ms/certU.ss
index 6a0302ed1d..095ea14330 100644
--- a/ms/certU.ss
+++ b/ms/certU.ss
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBcTCCARsCARgwDQYJKoZIhvcNAQEEBQAwOTELMAkGA1UEBhMCQVUxFzAVBgNV
-BAoTDkRvZGd5IEJyb3RoZXJzMREwDwYDVQQDEwhEb2RneSBDQTAeFw05NzExMjgw
-MDA3MzRaFw05NzEyMjgwMDA3MzRaME4xCzAJBgNVBAYTAkFVMRcwFQYDVQQKEw5E
+MIIBcTCCARsCARwwDQYJKoZIhvcNAQEEBQAwOTELMAkGA1UEBhMCQVUxFzAVBgNV
+BAoTDkRvZGd5IEJyb3RoZXJzMREwDwYDVQQDEwhEb2RneSBDQTAeFw05ODA3MjEw
+NjUwMjdaFw05ODA4MjAwNjUwMjdaME4xCzAJBgNVBAYTAkFVMRcwFQYDVQQKEw5E
 b2RneSBCcm90aGVyczESMBAGA1UEAxMJQnJvdGhlciAxMRIwEAYDVQQDEwlCcm90
-aGVyIDIwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAyfgRHCZvlyq9yiQisWmetnpb
-DZMhZB+HjuxQxp3gEpI7P8q5Z5tXIU5+OFAfIRkRdMGa/UK+NVg7AJ6UYyIR3wID
-AQABMA0GCSqGSIb3DQEBBAUAA0EAgH3htGAw6tMcZYANofqYr96RhjnxzCGZkUq3
-SH9thHUBywcXQo6BUpGxUXFExW4NA2f49OWQxf8kYrVAXHcCsA==
+aGVyIDIwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA0e4qorOr/zuLB9NvRaXhJVaI
+HaGGasa7eMAjVPitWAXkN+DxXiGH1CnMgQraKiYzsEVP15xtxkevEvK5jJpOwwID
+AQABMA0GCSqGSIb3DQEBBAUAA0EAZhcPV+SWwaszFuDTYc6fUurcV9OeXUqoxSQy
+MnLZPTyWubHbbkUr9fUfdf7Cc7dFqGzag05VHkNQUS9VjMzjIQ==
 -----END CERTIFICATE-----
diff --git a/ms/f.bat b/ms/f.bat
new file mode 100755
index 0000000000..b365924972
--- /dev/null
+++ b/ms/f.bat
@@ -0,0 +1,2 @@
+echo %%

+

diff --git a/ms/keyCA.ss b/ms/keyCA.ss
index 9ed3e7dc46..933c2cd6ed 100644
--- a/ms/keyCA.ss
+++ b/ms/keyCA.ss
@@ -1,9 +1,9 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAMDihMW3Xyi3phDBjingYKiN2myRPcs391oaz3EC0QMjPOWD8ZNA
-0GFsIRIfYtgcRlmAGeyq79RKnbFYgkARrgUCAwEAAQJAGEWo/ZRoth/+Fse0kxJ4
-N126acURKJx/VOhgyFDZanJxxwhaXRRkZZfXgFP5StY2lAOrcuMnsDjc8XYNrvcE
-wQIhAOXcIp0eZfoPAAuhoQ2bd94dg8QX+8Hv38oJBUuduTs1AiEA1tHvlMrRC1dp
-mPUWooFaRFfadFvCMJy5ouGQ24bKMZECIB1YiHbEvcI6DghuHzCsi5Yo8HyljzfI
-VyrlEe8AePiNAiEAv6Hxpnsy9noZAlEIyxi3TKZOg2Rjm/gDhfDQx3S7pHECIQDC
-R6w+uHZzVJ50/kNh3mJow2W2+Rffkk2hcM4r5Sf4Vg==
+MIIBOwIBAAJBANA0C3pzP53CugsEhCYTjtVn2VD1BIuKb6LPXx1uOfY4d60QwA4I
+t34gmMaEVUkIbweO5A2d1YjYOcqw4cuxfcsCAwEAAQJAOT9WOKEfyN0WEpl3TJDs
+ITmgw2XbjhLOh1HFsW3xegWlaOuhL/wGamz7n7zzL/RQF3JP/VvpGk2F8VD9JhwT
+wQIhAPmqM3fLttBoCQuwQRdIPfB7Ps3THqx6N8AJ04z3I1ejAiEA1XyDd7bLpWrw
+/oA8CmR4b/KCGfvRwAL/Qej/rQliw7kCIQCYRzSvO8ScpuflhjKdZcXJuRJcbgnG
+f6Ejc5rh3xdiawIhALMmLdzEFNjXiSzIx5mg/kBTLUJIw5dx7GqO8B9xBORhAiA5
+oTN/hgvvrkkmRsHQpNBmzAEGBzhMEEq9lD6ZWrTSRg==
 -----END RSA PRIVATE KEY-----
diff --git a/ms/keyU.ss b/ms/keyU.ss
index ab62876195..05d356e7a5 100644
--- a/ms/keyU.ss
+++ b/ms/keyU.ss
@@ -1,9 +1,9 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAMn4ERwmb5cqvcokIrFpnrZ6Ww2TIWQfh47sUMad4BKSOz/KuWeb
-VyFOfjhQHyEZEXTBmv1CvjVYOwCelGMiEd8CAwEAAQJAEu/4orwT4Ie4bfi/bAUs
-RY3pdbdi/SFbs5IC7OymsvbqO/J5/6lTLKX/CFUvXjbpd922jfNMQzdalOfZ7R+K
-aQIhAP9DOq6eFRbNqzxxDadOOSLFEcWBZwzIX12zoPgxarPDAiEAyo1tF3zbU93G
-WQ1yjlhXYm07VdoZV0CUI6dKkB0ok7UCIEmiQhZHAbxfPcskrZSaiv7NrE+2AVz9
-nAzymTefQbFzAiAFCODmTY8yFXghrIjlauK5Kpfn+WTZ21wTSsw6qs7gZQIhAK2l
-vwdD73PZSW928dZ9VoV7Dh7Klflf6J+xrJIibP7z
+MIIBPAIBAAJBANHuKqKzq/87iwfTb0Wl4SVWiB2hhmrGu3jAI1T4rVgF5Dfg8V4h
+h9QpzIEK2iomM7BFT9ecbcZHrxLyuYyaTsMCAwEAAQJBAIxtM6n4ZCJscxj+D13Y
+k13Fn3Gqvd6pJ3ijlj7dxh6tRBBQ3W9qmQflyvEc81giI2XtbVYBOEJKtJ1cWWZm
+gAkCIQDpEoOuc4KCI5ti6aMJvtxlXWNHbkXCxtbeIjH4+FnH9QIhAOaU3XVeWWOK
+PnnO87KniDjHQqWLnooivDGRK+FUKeDXAiEA2MjEvFVqFVvDIsxHPkBNROcI+Z6i
+ulkx76kErBtrfqUCIHN5uBLQZmngUPuFtiwRlLoCqJDphENfs+oK7vPQx4xPAiEA
+hnY2Ulrpld83IG6bUs95Loc8Fk81hez5YwmhsFEXVtk=
 -----END RSA PRIVATE KEY-----
diff --git a/ms/libeay16.def b/ms/libeay16.def
index 65bbad629e..51cf7644ec 100644
--- a/ms/libeay16.def
+++ b/ms/libeay16.def
@@ -84,12 +84,14 @@ EXPORTS
     _BIO_f_md                           @60
     _BIO_f_nbio_test                    @915
     _BIO_f_null                         @61
+    _BIO_f_proxy_server                 @62
     _BIO_fd_non_fatal_error             @63
     _BIO_fd_should_retry                @64
     _BIO_find_type                      @65
     _BIO_free                           @66
     _BIO_free_all                       @67
     _BIO_get_accept_socket              @69
+    _BIO_get_filter_bio                 @70
     _BIO_get_host_ip                    @71
     _BIO_get_port                       @72
     _BIO_get_retry_BIO                  @73
@@ -103,6 +105,7 @@ EXPORTS
     _BIO_new_connect                    @80
     _BIO_new_fd                         @81
     _BIO_new_socket                     @84
+    _BIO_new_socks4a_connect            @1110
     _BIO_pop                            @85
     _BIO_printf                         @86
     _BIO_ptr_ctrl                       @969
@@ -114,7 +117,9 @@ EXPORTS
     _BIO_s_fd                           @92
     _BIO_s_mem                          @95
     _BIO_s_null                         @96
+    _BIO_s_proxy_client                 @97
     _BIO_s_socket                       @98
+    _BIO_s_socks4a_connect              @1111
     _BIO_set                            @100
     _BIO_set_cipher                     @101
     _BIO_set_tcp_ndelay                 @102
@@ -124,6 +129,7 @@ EXPORTS
     _BIO_sock_non_fatal_error           @106
     _BIO_sock_should_retry              @107
     _BIO_socket_ioctl                   @108
+    _BIO_socket_nbio                    @1102
     _BIO_write                          @109
     _BN_BLINDING_convert                @973
     _BN_BLINDING_free                   @981
@@ -131,10 +137,16 @@ EXPORTS
     _BN_BLINDING_new                    @980
     _BN_BLINDING_update                 @975
     _BN_CTX_free                        @110
+    _BN_CTX_init                        @1135
     _BN_CTX_new                         @111
     _BN_MONT_CTX_free                   @112
+    _BN_MONT_CTX_init                   @1136
     _BN_MONT_CTX_new                    @113
     _BN_MONT_CTX_set                    @114
+    _BN_RECP_CTX_free                   @1130
+    _BN_RECP_CTX_init                   @1128
+    _BN_RECP_CTX_new                    @1129
+    _BN_RECP_CTX_set                    @1131
     _BN_add                             @115
     _BN_add_word                        @116
     _BN_bin2bn                          @118
@@ -149,6 +161,7 @@ EXPORTS
     _BN_copy                            @125
     _BN_dec2bn                          @1001
     _BN_div                             @126
+    _BN_div_recp                        @1134
     _BN_div_word                        @127
     _BN_dup                             @128
     _BN_exp                             @998
@@ -158,6 +171,7 @@ EXPORTS
     _BN_generate_prime                  @132
     _BN_get_word                        @133
     _BN_hex2bn                          @117
+    _BN_init                            @1095
     _BN_is_bit_set                      @134
     _BN_is_prime                        @135
     _BN_lshift                          @136
@@ -166,12 +180,12 @@ EXPORTS
     _BN_mod                             @139
     _BN_mod_exp                         @140
     _BN_mod_exp_mont                    @141
-    _BN_mod_exp_recp                    @142
+    _BN_mod_exp_recp                    @1133
     _BN_mod_exp_simple                  @143
     _BN_mod_inverse                     @144
     _BN_mod_mul                         @145
     _BN_mod_mul_montgomery              @146
-    _BN_mod_mul_reciprocal              @147
+    _BN_mod_mul_reciprocal              @1132
     _BN_mod_word                        @148
     _BN_mpi2bn                          @1059
     _BN_mul                             @149
@@ -191,7 +205,9 @@ EXPORTS
     _BN_sub                             @163
     _BN_sub_word                        @1000
     _BN_to_ASN1_INTEGER                 @164
+    _BN_uadd                            @708
     _BN_ucmp                            @165
+    _BN_usub                            @709
     _BN_value_one                       @166
     _BUF_MEM_free                       @167
     _BUF_MEM_grow                       @168
@@ -204,6 +220,12 @@ EXPORTS
     _CAST_encrypt                       @989
     _CAST_ofb64_encrypt                 @994
     _CAST_set_key                       @988
+    _COMP_CTX_free                      @1097
+    _COMP_CTX_new                       @1096
+    _COMP_compress_block                @1144
+    _COMP_expand_block                  @1145
+    _COMP_rle                           @1146
+    _COMP_zlib                          @1147
     _CONF_free                          @171
     _CONF_get_number                    @172
     _CONF_get_section                   @173
@@ -283,6 +305,7 @@ EXPORTS
     _ERR_load_OBJ_strings               @241
     _ERR_load_PEM_strings               @242
     _ERR_load_PKCS7_strings             @919
+    _ERR_load_PROXY_strings             @243
     _ERR_load_RSA_strings               @244
     _ERR_load_X509_strings              @245
     _ERR_load_crypto_strings            @246
@@ -339,7 +362,6 @@ EXPORTS
     _EVP_SealInit                       @288
     _EVP_SignFinal                      @289
     _EVP_VerifyFinal                    @290
-    _EVP_add_alias                      @291
     _EVP_add_cipher                     @292
     _EVP_add_digest                     @293
     _EVP_bf_cbc                         @294
@@ -351,7 +373,6 @@ EXPORTS
     _EVP_cast5_ecb                      @985
     _EVP_cast5_ofb                      @986
     _EVP_cleanup                        @298
-    _EVP_delete_alias                   @941
     _EVP_des_cbc                        @299
     _EVP_des_cfb                        @300
     _EVP_des_ecb                        @301
@@ -380,6 +401,7 @@ EXPORTS
     _EVP_md_null                        @324
     _EVP_mdc2                           @942
     _EVP_rc2_40_cbc                     @959
+    _EVP_rc2_64_cbc                     @1103
     _EVP_rc2_cbc                        @325
     _EVP_rc2_cfb                        @326
     _EVP_rc2_ecb                        @327
@@ -419,6 +441,12 @@ EXPORTS
     _NETSCAPE_SPKI_new                  @350
     _NETSCAPE_SPKI_sign                 @351
     _NETSCAPE_SPKI_verify               @352
+    _OBJ_NAME_add                       @1101
+    _OBJ_NAME_cleanup                   @1104
+    _OBJ_NAME_get                       @1105
+    _OBJ_NAME_init                      @1106
+    _OBJ_NAME_new_index                 @1107
+    _OBJ_NAME_remove                    @1108
     _OBJ_add_object                     @353
     _OBJ_bsearch                        @354
     _OBJ_cleanup                        @355
@@ -489,32 +517,58 @@ EXPORTS
     _PKCS7_SIGNER_INFO_set              @930
     _PKCS7_SIGN_ENVELOPE_free           @441
     _PKCS7_SIGN_ENVELOPE_new            @442
+    _PKCS7_add_attribute                @1138
     _PKCS7_add_certificate              @932
     _PKCS7_add_crl                      @933
     _PKCS7_add_recipient                @1073
     _PKCS7_add_recipient_info           @1074
     _PKCS7_add_signature                @938
+    _PKCS7_add_signed_attribute         @1139
     _PKCS7_add_signer                   @931
     _PKCS7_cert_from_signer_info        @939
     _PKCS7_content_free                 @918
     _PKCS7_content_new                  @934
     _PKCS7_ctrl                         @927
     _PKCS7_dataInit                     @937
-    _PKCS7_dataSign                     @935
     _PKCS7_dataVerify                   @936
+    _PKCS7_digest_from_attributes       @1140
     _PKCS7_dup                          @443
     _PKCS7_free                         @444
+    _PKCS7_get_attribute                @1141
+    _PKCS7_get_issuer_and_serial        @1142
+    _PKCS7_get_signed_attribute         @1143
     _PKCS7_get_signer_info              @940
     _PKCS7_new                          @445
     _PKCS7_set_cipher                   @1075
     _PKCS7_set_content                  @929
     _PKCS7_set_type                     @928
+    _PROXY_ENTRY_add_noproxy            @446
+    _PROXY_ENTRY_clear_noproxy          @447
+    _PROXY_ENTRY_free                   @448
+    _PROXY_ENTRY_get_noproxy            @449
+    _PROXY_ENTRY_new                    @450
+    _PROXY_ENTRY_set_server             @451
+    _PROXY_add_noproxy                  @452
+    _PROXY_add_server                   @453
+    _PROXY_check_by_host                @454
+    _PROXY_check_url                    @455
+    _PROXY_clear_noproxy                @456
+    _PROXY_free                         @457
+    _PROXY_get_noproxy                  @458
+    _PROXY_get_proxies                  @459
+    _PROXY_get_proxy_entry              @460
+    _PROXY_load_conf                    @461
+    _PROXY_new                          @462
+    _PROXY_print                        @463
+    _RAND_SSLeay                        @1113
     _RAND_bytes                         @464
     _RAND_cleanup                       @465
     _RAND_file_name                     @466
+    _RAND_get_rand_method               @1137
     _RAND_load_file                     @467
     _RAND_screen                        @468
     _RAND_seed                          @469
+    _RAND_set_rand_method               @1114
     _RAND_write_file                    @470
     _RC2_cbc_encrypt                    @471
     _RC2_cfb64_encrypt                  @472
@@ -549,6 +603,7 @@ EXPORTS
     _RSA_generate_key                   @485
     _RSA_get_ex_data                    @1029
     _RSA_get_ex_new_index               @1030
+    _RSA_memory_lock                    @1115
     _RSA_new                            @486
     _RSA_new_method                     @487
     _RSA_padding_add_PKCS1_type_1       @1031
@@ -659,7 +714,7 @@ EXPORTS
     _X509_NAME_print                    @586
     _X509_NAME_set                      @587
     _X509_OBJECT_free_contents          @588
-    _X509_OBJECT_retrive_by_subject     @589
+    _X509_OBJECT_retrieve_by_subject    @589
     _X509_OBJECT_up_ref_count           @590
     _X509_PKEY_free                     @591
     _X509_PKEY_new                      @592
@@ -697,6 +752,7 @@ EXPORTS
     _X509_STORE_CTX_get_error           @1016
     _X509_STORE_CTX_get_error_depth     @1017
     _X509_STORE_CTX_get_ex_data         @1018
+    _X509_STORE_CTX_get_ex_new_index    @1100
     _X509_STORE_CTX_init                @623
     _X509_STORE_CTX_set_cert            @1020
     _X509_STORE_CTX_set_chain           @1021
@@ -786,15 +842,26 @@ EXPORTS
     _asn1_GetSequence                   @703
     _asn1_add_error                     @1091
     _bn_add_words                       @1039
-    _bn_div64                           @704
+    _bn_cmp_words                       @1123
+    _bn_div_words                       @704
     _bn_expand2                         @705
     _bn_mul_add_words                   @706
+    _bn_mul_comba4                      @1119
+    _bn_mul_comba8                      @1118
+    _bn_mul_low_normal                  @1127
+    _bn_mul_normal                      @1117
+    _bn_mul_part_recursive              @1125
+    _bn_mul_recursive                   @1124
     _bn_mul_words                       @707
-    _bn_qadd                            @708
-    _bn_qsub                            @709
+    _bn_sqr_comba4                      @1122
+    _bn_sqr_comba8                      @1121
+    _bn_sqr_normal                      @1120
+    _bn_sqr_recursive                   @1126
     _bn_sqr_words                       @710
+    _bn_sub_words                       @1116
     _crypt                              @711
     _d2i_ASN1_BIT_STRING                @712
+    _d2i_ASN1_BMPSTRING                 @1092
     _d2i_ASN1_BOOLEAN                   @713
     _d2i_ASN1_HEADER                    @714
     _d2i_ASN1_IA5STRING                 @715
@@ -895,6 +962,7 @@ EXPORTS
     _i2a_ASN1_OBJECT                    @816
     _i2a_ASN1_STRING                    @817
     _i2d_ASN1_BIT_STRING                @818
+    _i2d_ASN1_BMPSTRING                 @1093
     _i2d_ASN1_BOOLEAN                   @819
     _i2d_ASN1_HEADER                    @820
     _i2d_ASN1_IA5STRING                 @821
@@ -970,6 +1038,11 @@ EXPORTS
     _lh_retrieve                        @897
     _lh_stats_bio                       @899
     _lh_strhash                         @900
+    _ms_time_cmp                        @1151
+    _ms_time_diff                       @1148
+    _ms_time_free                       @1150
+    _ms_time_get                        @1152
+    _ms_time_new                        @1149
     _sk_delete                          @901
     _sk_delete_ptr                      @902
     _sk_dup                             @903
diff --git a/ms/libeay32.def b/ms/libeay32.def
index 196c52216e..509a4085e2 100644
--- a/ms/libeay32.def
+++ b/ms/libeay32.def
@@ -78,12 +78,14 @@ EXPORTS
     BIO_f_md                           @60
     BIO_f_nbio_test                    @915
     BIO_f_null                         @61
+    BIO_f_proxy_server                 @62
     BIO_fd_non_fatal_error             @63
     BIO_fd_should_retry                @64
     BIO_find_type                      @65
     BIO_free                           @66
     BIO_free_all                       @67
     BIO_get_accept_socket              @69
+    BIO_get_filter_bio                 @70
     BIO_get_host_ip                    @71
     BIO_get_port                       @72
     BIO_get_retry_BIO                  @73
@@ -99,6 +101,7 @@ EXPORTS
     BIO_new_file                       @82
     BIO_new_fp                         @83
     BIO_new_socket                     @84
+    BIO_new_socks4a_connect            @1110
     BIO_pop                            @85
     BIO_printf                         @86
     BIO_ptr_ctrl                       @969
@@ -111,7 +114,9 @@ EXPORTS
     BIO_s_file                         @93
     BIO_s_mem                          @95
     BIO_s_null                         @96
+    BIO_s_proxy_client                 @97
     BIO_s_socket                       @98
+    BIO_s_socks4a_connect              @1111
     BIO_set                            @100
     BIO_set_cipher                     @101
     BIO_set_tcp_ndelay                 @102
@@ -121,6 +126,7 @@ EXPORTS
     BIO_sock_non_fatal_error           @106
     BIO_sock_should_retry              @107
     BIO_socket_ioctl                   @108
+    BIO_socket_nbio                    @1102
     BIO_write                          @109
     BN_BLINDING_convert                @973
     BN_BLINDING_free                   @981
@@ -128,10 +134,16 @@ EXPORTS
     BN_BLINDING_new                    @980
     BN_BLINDING_update                 @975
     BN_CTX_free                        @110
+    BN_CTX_init                        @1135
     BN_CTX_new                         @111
     BN_MONT_CTX_free                   @112
+    BN_MONT_CTX_init                   @1136
     BN_MONT_CTX_new                    @113
     BN_MONT_CTX_set                    @114
+    BN_RECP_CTX_free                   @1130
+    BN_RECP_CTX_init                   @1128
+    BN_RECP_CTX_new                    @1129
+    BN_RECP_CTX_set                    @1131
     BN_add                             @115
     BN_add_word                        @116
     BN_bin2bn                          @118
@@ -146,6 +158,7 @@ EXPORTS
     BN_copy                            @125
     BN_dec2bn                          @1001
     BN_div                             @126
+    BN_div_recp                        @1134
     BN_div_word                        @127
     BN_dup                             @128
     BN_exp                             @998
@@ -155,6 +168,7 @@ EXPORTS
     BN_generate_prime                  @132
     BN_get_word                        @133
     BN_hex2bn                          @117
+    BN_init                            @1095
     BN_is_bit_set                      @134
     BN_is_prime                        @135
     BN_lshift                          @136
@@ -163,12 +177,12 @@ EXPORTS
     BN_mod                             @139
     BN_mod_exp                         @140
     BN_mod_exp_mont                    @141
-    BN_mod_exp_recp                    @142
+    BN_mod_exp_recp                    @1133
     BN_mod_exp_simple                  @143
     BN_mod_inverse                     @144
     BN_mod_mul                         @145
     BN_mod_mul_montgomery              @146
-    BN_mod_mul_reciprocal              @147
+    BN_mod_mul_reciprocal              @1132
     BN_mod_word                        @148
     BN_mpi2bn                          @1059
     BN_mul                             @149
@@ -189,7 +203,9 @@ EXPORTS
     BN_sub                             @163
     BN_sub_word                        @1000
     BN_to_ASN1_INTEGER                 @164
+    BN_uadd                            @708
     BN_ucmp                            @165
+    BN_usub                            @709
     BN_value_one                       @166
     BUF_MEM_free                       @167
     BUF_MEM_grow                       @168
@@ -202,6 +218,12 @@ EXPORTS
     CAST_encrypt                       @989
     CAST_ofb64_encrypt                 @994
     CAST_set_key                       @988
+    COMP_CTX_free                      @1097
+    COMP_CTX_new                       @1096
+    COMP_compress_block                @1144
+    COMP_expand_block                  @1145
+    COMP_rle                           @1146
+    COMP_zlib                          @1147
     CONF_free                          @171
     CONF_get_number                    @172
     CONF_get_section                   @173
@@ -285,6 +307,7 @@ EXPORTS
     ERR_load_OBJ_strings               @241
     ERR_load_PEM_strings               @242
     ERR_load_PKCS7_strings             @919
+    ERR_load_PROXY_strings             @243
     ERR_load_RSA_strings               @244
     ERR_load_X509_strings              @245
     ERR_load_crypto_strings            @246
@@ -342,7 +365,6 @@ EXPORTS
     EVP_SealInit                       @288
     EVP_SignFinal                      @289
     EVP_VerifyFinal                    @290
-    EVP_add_alias                      @291
     EVP_add_cipher                     @292
     EVP_add_digest                     @293
     EVP_bf_cbc                         @294
@@ -354,7 +376,6 @@ EXPORTS
     EVP_cast5_ecb                      @985
     EVP_cast5_ofb                      @986
     EVP_cleanup                        @298
-    EVP_delete_alias                   @941
     EVP_des_cbc                        @299
     EVP_des_cfb                        @300
     EVP_des_ecb                        @301
@@ -383,6 +404,7 @@ EXPORTS
     EVP_md_null                        @324
     EVP_mdc2                           @942
     EVP_rc2_40_cbc                     @959
+    EVP_rc2_64_cbc                     @1103
     EVP_rc2_cbc                        @325
     EVP_rc2_cfb                        @326
     EVP_rc2_ecb                        @327
@@ -422,6 +444,12 @@ EXPORTS
     NETSCAPE_SPKI_new                  @350
     NETSCAPE_SPKI_sign                 @351
     NETSCAPE_SPKI_verify               @352
+    OBJ_NAME_add                       @1101
+    OBJ_NAME_cleanup                   @1104
+    OBJ_NAME_get                       @1105
+    OBJ_NAME_init                      @1106
+    OBJ_NAME_new_index                 @1107
+    OBJ_NAME_remove                    @1108
     OBJ_add_object                     @353
     OBJ_bsearch                        @354
     OBJ_cleanup                        @355
@@ -517,32 +545,58 @@ EXPORTS
     PKCS7_SIGNER_INFO_set              @930
     PKCS7_SIGN_ENVELOPE_free           @441
     PKCS7_SIGN_ENVELOPE_new            @442
+    PKCS7_add_attribute                @1138
     PKCS7_add_certificate              @932
     PKCS7_add_crl                      @933
     PKCS7_add_recipient                @1073
     PKCS7_add_recipient_info           @1074
     PKCS7_add_signature                @938
+    PKCS7_add_signed_attribute         @1139
     PKCS7_add_signer                   @931
     PKCS7_cert_from_signer_info        @939
     PKCS7_content_free                 @918
     PKCS7_content_new                  @934
     PKCS7_ctrl                         @927
     PKCS7_dataInit                     @937
-    PKCS7_dataSign                     @935
     PKCS7_dataVerify                   @936
+    PKCS7_digest_from_attributes       @1140
     PKCS7_dup                          @443
     PKCS7_free                         @444
+    PKCS7_get_attribute                @1141
+    PKCS7_get_issuer_and_serial        @1142
+    PKCS7_get_signed_attribute         @1143
     PKCS7_get_signer_info              @940
     PKCS7_new                          @445
     PKCS7_set_cipher                   @1075
     PKCS7_set_content                  @929
     PKCS7_set_type                     @928
+    PROXY_ENTRY_add_noproxy            @446
+    PROXY_ENTRY_clear_noproxy          @447
+    PROXY_ENTRY_free                   @448
+    PROXY_ENTRY_get_noproxy            @449
+    PROXY_ENTRY_new                    @450
+    PROXY_ENTRY_set_server             @451
+    PROXY_add_noproxy                  @452
+    PROXY_add_server                   @453
+    PROXY_check_by_host                @454
+    PROXY_check_url                    @455
+    PROXY_clear_noproxy                @456
+    PROXY_free                         @457
+    PROXY_get_noproxy                  @458
+    PROXY_get_proxies                  @459
+    PROXY_get_proxy_entry              @460
+    PROXY_load_conf                    @461
+    PROXY_new                          @462
+    PROXY_print                        @463
+    RAND_SSLeay                        @1113
     RAND_bytes                         @464
     RAND_cleanup                       @465
     RAND_file_name                     @466
+    RAND_get_rand_method               @1137
     RAND_load_file                     @467
     RAND_screen                        @468
     RAND_seed                          @469
+    RAND_set_rand_method               @1114
     RAND_write_file                    @470
     RC2_cbc_encrypt                    @471
     RC2_cfb64_encrypt                  @472
@@ -577,6 +631,7 @@ EXPORTS
     RSA_generate_key                   @485
     RSA_get_ex_data                    @1029
     RSA_get_ex_new_index               @1030
+    RSA_memory_lock                    @1115
     RSA_new                            @486
     RSA_new_method                     @487
     RSA_padding_add_PKCS1_type_1       @1031
@@ -688,7 +743,7 @@ EXPORTS
     X509_NAME_print                    @586
     X509_NAME_set                      @587
     X509_OBJECT_free_contents          @588
-    X509_OBJECT_retrive_by_subject     @589
+    X509_OBJECT_retrieve_by_subject    @589
     X509_OBJECT_up_ref_count           @590
     X509_PKEY_free                     @591
     X509_PKEY_new                      @592
@@ -727,6 +782,7 @@ EXPORTS
     X509_STORE_CTX_get_error           @1016
     X509_STORE_CTX_get_error_depth     @1017
     X509_STORE_CTX_get_ex_data         @1018
+    X509_STORE_CTX_get_ex_new_index    @1100
     X509_STORE_CTX_init                @623
     X509_STORE_CTX_set_cert            @1020
     X509_STORE_CTX_set_chain           @1021
@@ -817,15 +873,26 @@ EXPORTS
     asn1_GetSequence                   @703
     asn1_add_error                     @1091
     bn_add_words                       @1039
-    bn_div64                           @704
+    bn_cmp_words                       @1123
+    bn_div_words                       @704
     bn_expand2                         @705
     bn_mul_add_words                   @706
+    bn_mul_comba4                      @1119
+    bn_mul_comba8                      @1118
+    bn_mul_low_normal                  @1127
+    bn_mul_normal                      @1117
+    bn_mul_part_recursive              @1125
+    bn_mul_recursive                   @1124
     bn_mul_words                       @707
-    bn_qadd                            @708
-    bn_qsub                            @709
+    bn_sqr_comba4                      @1122
+    bn_sqr_comba8                      @1121
+    bn_sqr_normal                      @1120
+    bn_sqr_recursive                   @1126
     bn_sqr_words                       @710
+    bn_sub_words                       @1116
     crypt                              @711
     d2i_ASN1_BIT_STRING                @712
+    d2i_ASN1_BMPSTRING                 @1092
     d2i_ASN1_BOOLEAN                   @713
     d2i_ASN1_HEADER                    @714
     d2i_ASN1_IA5STRING                 @715
@@ -933,6 +1000,7 @@ EXPORTS
     i2a_ASN1_OBJECT                    @816
     i2a_ASN1_STRING                    @817
     i2d_ASN1_BIT_STRING                @818
+    i2d_ASN1_BMPSTRING                 @1093
     i2d_ASN1_BOOLEAN                   @819
     i2d_ASN1_HEADER                    @820
     i2d_ASN1_IA5STRING                 @821
@@ -1018,6 +1086,11 @@ EXPORTS
     lh_stats                           @898
     lh_stats_bio                       @899
     lh_strhash                         @900
+    ms_time_cmp                        @1151
+    ms_time_diff                       @1148
+    ms_time_free                       @1150
+    ms_time_get                        @1152
+    ms_time_new                        @1149
     sk_delete                          @901
     sk_delete_ptr                      @902
     sk_dup                             @903
diff --git a/ms/ntdll.mak b/ms/ntdll.mak
index 044cd909bc..389ac22bf2 100644
--- a/ms/ntdll.mak
+++ b/ms/ntdll.mak
@@ -14,8 +14,9 @@
 INSTALLTOP=\usr\local\ssl
 
 # Set your compiler options
+PLATFORM=VC-WIN32
 CC=cl
-CFLAG= /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM
+CFLAG= /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM /Fdout32dll
 APP_CFLAG=
 LIB_CFLAG= /GD -D_WINDLL -D_DLL
 SHLIB_CFLAG=
@@ -31,12 +32,10 @@ SRC_D=.
 LINK=link
 LFLAGS=/nologo /subsystem:console /machine:I386 /opt:ref
 
-BN_MULW_OBJ=crypto\bn\asm\bn-win32.obj
-BN_MULW_SRC=crypto\bn\asm\bn-win32.asm
+BN_ASM_OBJ=crypto\bn\asm\bn-win32.obj
+BN_ASM_SRC=crypto\bn\asm\bn-win32.asm
 DES_ENC_OBJ=crypto\des\asm\d-win32.obj crypto\des\asm\y-win32.obj
 DES_ENC_SRC=crypto\des\asm\d-win32.asm crypto\des\asm\y-win32.asm
-DES_CRYPT_OBJ=
-DES_CRYPT_SRC=
 BF_ENC_OBJ=crypto\bf\asm\b-win32.obj
 BF_ENC_SRC=crypto\bf\asm\b-win32.asm
 CAST_ENC_OBJ=crypto\cast\asm\c-win32.obj
@@ -59,7 +58,7 @@ TMP_D=tmp32dll
 # The output directory for the header files
 INC_D=inc32
 
-CP=copy
+CP="copy /b nul+ "
 RM=del
 RANLIB=
 MKDIR=mkdir
@@ -120,21 +119,22 @@ HEADER=$(INCL_D)\cryptlib.h \
 	$(INCL_D)\cast_lcl.h $(INCL_D)\bn_lcl.h $(INCL_D)\bn_prime.h \
 	$(INCL_D)\obj_dat.h $(INCL_D)\conf_lcl.h $(INCL_D)\ssl_locl.h \
 	$(INCL_D)\rsaref.h $(INCL_D)\apps.h $(INCL_D)\progs.h \
-	$(INCL_D)\s_apps.h $(INCL_D)\testdsa.h $(INCL_D)\testrsa.h
+	$(INCL_D)\testdsa.h $(INCL_D)\testrsa.h
 
 EXHEADER=$(INC_D)\e_os.h \
-	$(INC_D)\crypto.h