Update WIN32 build system for CMS and update ordinals.

diff --git a/util/libeay.num b/util/libeay.num
index b261e7b0ec8f9ef49d1d7486ed9e05f850a9197c..5b2c9336b1b8d958f2e93cd6c702bf339cafdfd6 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3542,3 +3542,111 @@ i2d_X509_ALGORS                         3934    EXIST::FUNCTION:
 BIO_f_zlib                              3935   EXIST:ZLIB:FUNCTION:
 COMP_zlib_cleanup                       3936   EXIST::FUNCTION:
 d2i_X509_ALGORS                         3937   EXIST::FUNCTION:
+CMS_ReceiptRequest_free                 3938   EXIST::FUNCTION:CMS
+PEM_write_CMS                           3939   EXIST:!WIN16:FUNCTION:CMS
+CMS_add0_CertificateChoices             3940   EXIST::FUNCTION:CMS
+CMS_unsigned_add1_attr_by_OBJ           3941   EXIST::FUNCTION:CMS
+ERR_load_CMS_strings                    3942   EXIST::FUNCTION:CMS
+CMS_sign_receipt                        3943   EXIST::FUNCTION:CMS
+i2d_CMS_ContentInfo                     3944   EXIST::FUNCTION:CMS
+CMS_signed_delete_attr                  3945   EXIST::FUNCTION:CMS
+d2i_CMS_bio                             3946   EXIST::FUNCTION:CMS
+CMS_unsigned_get_attr_by_NID            3947   EXIST::FUNCTION:CMS
+CMS_verify                              3948   EXIST::FUNCTION:CMS
+SMIME_read_CMS                          3949   EXIST::FUNCTION:CMS
+CMS_decrypt_set1_key                    3950   EXIST::FUNCTION:CMS
+CMS_SignerInfo_get0_algs                3951   EXIST::FUNCTION:CMS
+CMS_add1_cert                           3952   EXIST::FUNCTION:CMS
+CMS_set_detached                        3953   EXIST::FUNCTION:CMS
+CMS_encrypt                             3954   EXIST::FUNCTION:CMS
+CMS_EnvelopedData_create                3955   EXIST::FUNCTION:CMS
+CMS_uncompress                          3956   EXIST::FUNCTION:CMS
+CMS_add0_crl                            3957   EXIST::FUNCTION:CMS
+CMS_SignerInfo_verify_content           3958   EXIST::FUNCTION:CMS
+CMS_unsigned_get0_data_by_OBJ           3959   EXIST::FUNCTION:CMS
+PEM_write_bio_CMS                       3960   EXIST::FUNCTION:CMS
+CMS_unsigned_get_attr                   3961   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_ktri_cert_cmp         3962   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_ktri_get0_algs        3963   EXIST::FUNCTION:CMS
+CMS_ContentInfo_free                    3964   EXIST::FUNCTION:CMS
+CMS_final                               3965   EXIST::FUNCTION:CMS
+CMS_add_simple_smimecap                 3966   EXIST::FUNCTION:CMS
+CMS_SignerInfo_verify                   3967   EXIST::FUNCTION:CMS
+CMS_data                                3968   EXIST::FUNCTION:CMS
+CMS_ContentInfo_it                      3969   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMS
+CMS_ContentInfo_it                      3969   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMS
+d2i_CMS_ReceiptRequest                  3970   EXIST::FUNCTION:CMS
+CMS_compress                            3971   EXIST::FUNCTION:CMS
+CMS_digest_create                       3972   EXIST::FUNCTION:CMS
+CMS_SignerInfo_cert_cmp                 3973   EXIST::FUNCTION:CMS
+CMS_SignerInfo_sign                     3974   EXIST::FUNCTION:CMS
+CMS_data_create                         3975   EXIST::FUNCTION:CMS
+i2d_CMS_bio                             3976   EXIST::FUNCTION:CMS
+CMS_EncryptedData_set1_key              3977   EXIST::FUNCTION:CMS
+CMS_decrypt                             3978   EXIST::FUNCTION:CMS
+int_smime_write_ASN1                    3979   EXIST::FUNCTION:
+CMS_unsigned_delete_attr                3980   EXIST::FUNCTION:CMS
+CMS_unsigned_get_attr_count             3981   EXIST::FUNCTION:CMS
+CMS_add_smimecap                        3982   EXIST::FUNCTION:CMS
+PEM_read_CMS                            3983   EXIST:!WIN16:FUNCTION:CMS
+CMS_signed_get_attr_by_OBJ              3984   EXIST::FUNCTION:CMS
+d2i_CMS_ContentInfo                     3985   EXIST::FUNCTION:CMS
+CMS_add_standard_smimecap               3986   EXIST::FUNCTION:CMS
+CMS_ContentInfo_new                     3987   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_type                  3988   EXIST::FUNCTION:CMS
+CMS_get0_type                           3989   EXIST::FUNCTION:CMS
+CMS_is_detached                         3990   EXIST::FUNCTION:CMS
+CMS_sign                                3991   EXIST::FUNCTION:CMS
+CMS_signed_add1_attr                    3992   EXIST::FUNCTION:CMS
+CMS_unsigned_get_attr_by_OBJ            3993   EXIST::FUNCTION:CMS
+SMIME_write_CMS                         3994   EXIST::FUNCTION:CMS
+CMS_EncryptedData_decrypt               3995   EXIST::FUNCTION:CMS
+CMS_get0_RecipientInfos                 3996   EXIST::FUNCTION:CMS
+CMS_add0_RevocationInfoChoice           3997   EXIST::FUNCTION:CMS
+CMS_decrypt_set1_pkey                   3998   EXIST::FUNCTION:CMS
+CMS_SignerInfo_set1_signer_cert         3999   EXIST::FUNCTION:CMS
+CMS_get0_signers                        4000   EXIST::FUNCTION:CMS
+CMS_ReceiptRequest_get0_values          4001   EXIST::FUNCTION:CMS
+CMS_signed_get0_data_by_OBJ             4002   EXIST::FUNCTION:CMS
+CMS_get0_SignerInfos                    4003   EXIST::FUNCTION:CMS
+CMS_add0_cert                           4004   EXIST::FUNCTION:CMS
+CMS_EncryptedData_encrypt               4005   EXIST::FUNCTION:CMS
+CMS_digest_verify                       4006   EXIST::FUNCTION:CMS
+CMS_set1_signers_certs                  4007   EXIST::FUNCTION:CMS
+CMS_signed_get_attr                     4008   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_set0_key              4009   EXIST::FUNCTION:CMS
+CMS_SignedData_init                     4010   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_kekri_get0_id         4011   EXIST::FUNCTION:CMS
+CMS_verify_receipt                      4012   EXIST::FUNCTION:CMS
+CMS_ReceiptRequest_it                   4013   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMS
+CMS_ReceiptRequest_it                   4013   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMS
+PEM_read_bio_CMS                        4014   EXIST::FUNCTION:CMS
+CMS_get1_crls                           4015   EXIST::FUNCTION:CMS
+CMS_add0_recipient_key                  4016   EXIST::FUNCTION:CMS
+SMIME_read_ASN1                         4017   EXIST::FUNCTION:
+CMS_ReceiptRequest_new                  4018   EXIST::FUNCTION:CMS
+CMS_get0_content                        4019   EXIST::FUNCTION:CMS
+CMS_get1_ReceiptRequest                 4020   EXIST::FUNCTION:CMS
+CMS_signed_add1_attr_by_OBJ             4021   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_kekri_id_cmp          4022   EXIST::FUNCTION:CMS
+CMS_add1_ReceiptRequest                 4023   EXIST::FUNCTION:CMS
+CMS_SignerInfo_get0_signer_id           4024   EXIST::FUNCTION:CMS
+CMS_unsigned_add1_attr_by_NID           4025   EXIST::FUNCTION:CMS
+CMS_unsigned_add1_attr                  4026   EXIST::FUNCTION:CMS
+CMS_signed_get_attr_by_NID              4027   EXIST::FUNCTION:CMS
+CMS_get1_certs                          4028   EXIST::FUNCTION:CMS
+CMS_signed_add1_attr_by_NID             4029   EXIST::FUNCTION:CMS
+CMS_unsigned_add1_attr_by_txt           4030   EXIST::FUNCTION:CMS
+CMS_dataFinal                           4031   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_ktri_get0_signer_id   4032   EXIST::FUNCTION:CMS
+i2d_CMS_ReceiptRequest                  4033   EXIST::FUNCTION:CMS
+CMS_add1_recipient_cert                 4034   EXIST::FUNCTION:CMS
+CMS_dataInit                            4035   EXIST::FUNCTION:CMS
+CMS_signed_add1_attr_by_txt             4036   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_decrypt               4037   EXIST::FUNCTION:CMS
+CMS_signed_get_attr_count               4038   EXIST::FUNCTION:CMS
+CMS_get0_eContentType                   4039   EXIST::FUNCTION:CMS
+CMS_set1_eContentType                   4040   EXIST::FUNCTION:CMS
+CMS_ReceiptRequest_create0              4041   EXIST::FUNCTION:CMS
+CMS_add1_signer                         4042   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_set0_pkey             4043   EXIST::FUNCTION:CMS

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index a1a7c6b8259476487dc87ea1fc84dd2c190ce503..77af8a7e57a8e1b4bb058a0b3a77de0bb519d3bc 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -750,6 +750,7 @@ sub var_add
        return("") if $no_dsa  && $dir =~ /\/dsa/;
        return("") if $no_dh   && $dir =~ /\/dh/;
        return("") if $no_ec   && $dir =~ /\/ec/;
+       return("") if $no_cms  && $dir =~ /\/cms/;
        if ($no_des && $dir =~ /\/des/)
                {
                if ($val =~ /read_pwd/)

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 450bbf822d27c4f454712715a2e429f04cf522d4..ef1cc6e5134e44162c8fd5c8232e68caabe6a045 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1130,6 +1130,7 @@ sub is_valid
                        if ($keyword eq "GMP" && $no_gmp) { return 0; }
                        if ($keyword eq "RFC3779" && $no_rfc3779) { return 0; }
                        if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
+                       if ($keyword eq "CMS" && $no_cms) { return 0; }
                        if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
 
                        # Nothing recognise as true