Ignore:
Timestamp:
Aug 7, 2014, 8:25:37 PM (11 years ago)
Author:
dmik
Message:

openssl: Merge version 1.0.0n from vendor to trunk.

Location:
openssl/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • openssl/trunk

  • TabularUnified openssl/trunk/test/cms-test.pl

    r150 r808  
    5555
    5656my $ossl_path;
    57 my $redir = " 2>cms.err 1>cms.out";
     57my $redir = " 2> cms.err > cms.out";
     58# Make VMS work
     59if ( $^O eq "VMS" && -f "OSSLX:openssl.exe" ) {
     60    $ossl_path = "pipe mcr OSSLX:openssl";
     61}
    5862# Make MSYS work
    59 if ( $^O eq "MSWin32" && -f "../apps/openssl.exe" ) {
     63elsif ( $^O eq "MSWin32" && -f "../apps/openssl.exe" ) {
    6064    $ossl_path = "cmd /c ..\\apps\\openssl";
    6165}
    … …  
    8589    [
    8690        "signed content DER format, RSA key",
    87         "-sign -in smcont.txt -outform DER -nodetach"
     91        "-sign -in smcont.txt -outform \"DER\" -nodetach"
    8892          . " -certfile $smdir/smroot.pem"
    8993          . " -signer $smdir/smrsa1.pem -out test.cms",
    90         "-verify -in test.cms -inform DER "
    91           . " -CAfile $smdir/smroot.pem -out smtst.txt"
     94        "-verify -in test.cms -inform \"DER\" "
     95          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
    9296    ],
    9397
    9498    [
    9599        "signed detached content DER format, RSA key",
    96         "-sign -in smcont.txt -outform DER"
     100        "-sign -in smcont.txt -outform \"DER\""
    97101          . " -signer $smdir/smrsa1.pem -out test.cms",
    98         "-verify -in test.cms -inform DER "
    99           . " -CAfile $smdir/smroot.pem -out smtst.txt -content smcont.txt"
     102        "-verify -in test.cms -inform \"DER\" "
     103          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt -content smcont.txt"
    100104    ],
    101105
    102106    [
    103107        "signed content test streaming BER format, RSA",
    104         "-sign -in smcont.txt -outform DER -nodetach"
     108        "-sign -in smcont.txt -outform \"DER\" -nodetach"
    105109          . " -stream -signer $smdir/smrsa1.pem -out test.cms",
    106         "-verify -in test.cms -inform DER "
    107           . " -CAfile $smdir/smroot.pem -out smtst.txt"
     110        "-verify -in test.cms -inform \"DER\" "
     111          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
    108112    ],
    109113
    110114    [
    111115        "signed content DER format, DSA key",
    112         "-sign -in smcont.txt -outform DER -nodetach"
     116        "-sign -in smcont.txt -outform \"DER\" -nodetach"
    113117          . " -signer $smdir/smdsa1.pem -out test.cms",
    114         "-verify -in test.cms -inform DER "
    115           . " -CAfile $smdir/smroot.pem -out smtst.txt"
     118        "-verify -in test.cms -inform \"DER\" "
     119          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
    116120    ],
    117121
    118122    [
    119123        "signed detached content DER format, DSA key",
    120         "-sign -in smcont.txt -outform DER"
     124        "-sign -in smcont.txt -outform \"DER\""
    121125          . " -signer $smdir/smdsa1.pem -out test.cms",
    122         "-verify -in test.cms -inform DER "
    123           . " -CAfile $smdir/smroot.pem -out smtst.txt -content smcont.txt"
     126        "-verify -in test.cms -inform \"DER\" "
     127          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt -content smcont.txt"
    124128    ],
    125129
    126130    [
    127131        "signed detached content DER format, add RSA signer",
    128         "-resign -inform DER -in test.cms -outform DER"
     132        "-resign -inform \"DER\" -in test.cms -outform \"DER\""
    129133          . " -signer $smdir/smrsa1.pem -out test2.cms",
    130         "-verify -in test2.cms -inform DER "
    131           . " -CAfile $smdir/smroot.pem -out smtst.txt -content smcont.txt"
     134        "-verify -in test2.cms -inform \"DER\" "
     135          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt -content smcont.txt"
    132136    ],
    133137
    134138    [
    135139        "signed content test streaming BER format, DSA key",
    136         "-sign -in smcont.txt -outform DER -nodetach"
     140        "-sign -in smcont.txt -outform \"DER\" -nodetach"
    137141          . " -stream -signer $smdir/smdsa1.pem -out test.cms",
    138         "-verify -in test.cms -inform DER "
    139           . " -CAfile $smdir/smroot.pem -out smtst.txt"
     142        "-verify -in test.cms -inform \"DER\" "
     143          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
    140144    ],
    141145
    142146    [
    143147        "signed content test streaming BER format, 2 DSA and 2 RSA keys",
    144         "-sign -in smcont.txt -outform DER -nodetach"
    145           . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
    146           . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
    147           . " -stream -out test.cms",
    148         "-verify -in test.cms -inform DER "
    149           . " -CAfile $smdir/smroot.pem -out smtst.txt"
     148        "-sign -in smcont.txt -outform \"DER\" -nodetach"
     149          . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
     150          . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
     151          . " -stream -out test.cms",
     152        "-verify -in test.cms -inform \"DER\" "
     153          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
    150154    ],
    151155
    152156    [
    153157"signed content test streaming BER format, 2 DSA and 2 RSA keys, no attributes",
    154         "-sign -in smcont.txt -outform DER -noattr -nodetach"
    155           . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
    156           . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
    157           . " -stream -out test.cms",
    158         "-verify -in test.cms -inform DER "
    159           . " -CAfile $smdir/smroot.pem -out smtst.txt"
     158        "-sign -in smcont.txt -outform \"DER\" -noattr -nodetach"
     159          . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
     160          . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
     161          . " -stream -out test.cms",
     162        "-verify -in test.cms -inform \"DER\" "
     163          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
    160164    ],
    161165
    … …  
    166170          . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
    167171          . " -stream -out test.cms",
    168         "-verify -in test.cms " . " -CAfile $smdir/smroot.pem -out smtst.txt"
     172        "-verify -in test.cms " . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
    169173    ],
    170174
    … …  
    175179          . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
    176180          . " -stream -out test.cms",
    177         "-verify -in test.cms " . " -CAfile $smdir/smroot.pem -out smtst.txt"
     181        "-verify -in test.cms " . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
    178182    ],
    179183
    … …  
    216220    [
    217221        "signed content test streaming BER format, 2 DSA and 2 RSA keys, keyid",
    218         "-sign -in smcont.txt -outform DER -nodetach -keyid"
    219           . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
    220           . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
    221           . " -stream -out test.cms",
    222         "-verify -in test.cms -inform DER "
    223           . " -CAfile $smdir/smroot.pem -out smtst.txt"
     222        "-sign -in smcont.txt -outform \"DER\" -nodetach -keyid"
     223          . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
     224          . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
     225          . " -stream -out test.cms",
     226        "-verify -in test.cms -inform \"DER\" "
     227          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
    224228    ],
    225229
    … …  
    231235          . " -stream -out test.cms",
    232236        "-verify -in test.cms -inform PEM "
    233           . " -CAfile $smdir/smroot.pem -out smtst.txt"
     237          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
    234238    ],
    235239
    … …  
    240244          . " -out test.cms",
    241245        "-verify -in test.cms "
    242           . " -CAfile $smdir/smroot.pem -out smtst.txt"
     246          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
    243247    ],
    244248
    … …  
    249253          . " -out test2.cms",
    250254        "-verify_receipt test2.cms -in test.cms"
    251           . " -CAfile $smdir/smroot.pem"
     255          . " \"-CAfile\" $smdir/smroot.pem"
    252256    ],
    253257
    … …  
    290294    [
    291295        "encrypted content test streaming PEM format, 128 bit RC2 key",
    292         "-EncryptedData_encrypt -in smcont.txt -outform PEM"
     296        "\"-EncryptedData_encrypt\" -in smcont.txt -outform PEM"
    293297          . " -rc2 -secretkey 000102030405060708090A0B0C0D0E0F"
    294298          . " -stream -out test.cms",
    295         "-EncryptedData_decrypt -in test.cms -inform PEM "
     299        "\"-EncryptedData_decrypt\" -in test.cms -inform PEM "
    296300          . " -secretkey 000102030405060708090A0B0C0D0E0F -out smtst.txt"
    297301    ],
    … …  
    299303    [
    300304        "encrypted content test streaming PEM format, 40 bit RC2 key",
    301         "-EncryptedData_encrypt -in smcont.txt -outform PEM"
     305        "\"-EncryptedData_encrypt\" -in smcont.txt -outform PEM"
    302306          . " -rc2 -secretkey 0001020304"
    303307          . " -stream -out test.cms",
    304         "-EncryptedData_decrypt -in test.cms -inform PEM "
     308        "\"-EncryptedData_decrypt\" -in test.cms -inform PEM "
    305309          . " -secretkey 0001020304 -out smtst.txt"
    306310    ],
    … …  
    308312    [
    309313        "encrypted content test streaming PEM format, triple DES key",
    310         "-EncryptedData_encrypt -in smcont.txt -outform PEM"
     314        "\"-EncryptedData_encrypt\" -in smcont.txt -outform PEM"
    311315          . " -des3 -secretkey 000102030405060708090A0B0C0D0E0F1011121314151617"
    312316          . " -stream -out test.cms",
    313         "-EncryptedData_decrypt -in test.cms -inform PEM "
     317        "\"-EncryptedData_decrypt\" -in test.cms -inform PEM "
    314318          . " -secretkey 000102030405060708090A0B0C0D0E0F1011121314151617"
    315319          . " -out smtst.txt"
    … …  
    318322    [
    319323        "encrypted content test streaming PEM format, 128 bit AES key",
    320         "-EncryptedData_encrypt -in smcont.txt -outform PEM"
     324        "\"-EncryptedData_encrypt\" -in smcont.txt -outform PEM"
    321325          . " -aes128 -secretkey 000102030405060708090A0B0C0D0E0F"
    322326          . " -stream -out test.cms",
    323         "-EncryptedData_decrypt -in test.cms -inform PEM "
     327        "\"-EncryptedData_decrypt\" -in test.cms -inform PEM "
    324328          . " -secretkey 000102030405060708090A0B0C0D0E0F -out smtst.txt"
    325329    ],
    … …  
    412416
    413417sub cmp_files {
     418    use FileHandle;
    414419    my ( $f1, $f2 ) = @_;
    415     my ( $fp1, $fp2 );
     420    my $fp1 = FileHandle->new();
     421    my $fp2 = FileHandle->new();
    416422
    417423    my ( $rd1, $rd2 );
Note: See TracChangeset for help on using the changeset viewer.