OpenSSL 0.9.7 stable 2002 05 08 merge

1 files changed, 119 insertions, 2 deletions

diff --git a/src/lib/libcrypto/objects/obj_mac.num b/src/lib/libcrypto/objects/obj_mac.num
index d73a51370f..02b39062fe 100644
--- a/src/lib/libcrypto/objects/obj_mac.num
+++ b/src/lib/libcrypto/objects/obj_mac.num
@@ -30,8 +30,8 @@ dhKeyAgreement		28
 des_ecb         29
 des_cfb64               30
 des_cbc         31
-des_ede         32
-des_ede3                33
+des_ede_ecb             32
+des_ede3_ecb            33
 idea_cbc                34
 idea_cfb64              35
 idea_ecb                36
@@ -390,3 +390,120 @@ Enterprises		389
 dcObject                390
 domainComponent         391
 Domain          392
+joint_iso_ccitt         393
+selected_attribute_types                394
+clearance               395
+md4WithRSAEncryption            396
+ac_proxying             397
+sinfo_access            398
+id_aca_encAttrs         399
+role            400
+policy_constraints              401
+target_information              402
+no_rev_avail            403
+ccitt           404
+ansi_X9_62              405
+X9_62_prime_field               406
+X9_62_characteristic_two_field          407
+X9_62_id_ecPublicKey            408
+X9_62_prime192v1                409
+X9_62_prime192v2                410
+X9_62_prime192v3                411
+X9_62_prime239v1                412
+X9_62_prime239v2                413
+X9_62_prime239v3                414
+X9_62_prime256v1                415
+ecdsa_with_SHA1         416
+ms_csp_name             417
+aes_128_ecb             418
+aes_128_cbc             419
+aes_128_ofb128          420
+aes_128_cfb128          421
+aes_192_ecb             422
+aes_192_cbc             423
+aes_192_ofb128          424
+aes_192_cfb128          425
+aes_256_ecb             426
+aes_256_cbc             427
+aes_256_ofb128          428
+aes_256_cfb128          429
+hold_instruction_code           430
+hold_instruction_none           431
+hold_instruction_call_issuer            432
+hold_instruction_reject         433
+data            434
+pss             435
+ucl             436
+pilot           437
+pilotAttributeType              438
+pilotAttributeSyntax            439
+pilotObjectClass                440
+pilotGroups             441
+iA5StringSyntax         442
+caseIgnoreIA5StringSyntax               443
+pilotObject             444
+pilotPerson             445
+account         446
+document                447
+room            448
+documentSeries          449
+rFC822localPart         450
+dNSDomain               451
+domainRelatedObject             452
+friendlyCountry         453
+simpleSecurityObject            454
+pilotOrganization               455
+pilotDSA                456
+qualityLabelledData             457
+userId          458
+textEncodedORAddress            459
+rfc822Mailbox           460
+info            461
+favouriteDrink          462
+roomNumber              463
+photo           464
+userClass               465
+host            466
+manager         467
+documentIdentifier              468
+documentTitle           469
+documentVersion         470
+documentAuthor          471
+documentLocation                472
+homeTelephoneNumber             473
+secretary               474
+otherMailbox            475
+lastModifiedTime                476
+lastModifiedBy          477
+aRecord         478
+pilotAttributeType27            479
+mXRecord                480
+nSRecord                481
+sOARecord               482
+cNAMERecord             483
+associatedDomain                484
+associatedName          485
+homePostalAddress               486
+personalTitle           487
+mobileTelephoneNumber           488
+pagerTelephoneNumber            489
+friendlyCountryName             490
+organizationalStatus            491
+janetMailbox            492
+mailPreferenceOption            493
+buildingName            494
+dSAQuality              495
+singleLevelQuality              496
+subtreeMinimumQuality           497
+subtreeMaximumQuality           498
+personalSignature               499
+dITRedirect             500
+audio           501
+documentPublisher               502
+x500UniqueIdentifier            503
+mime_mhs                504
+mime_mhs_headings               505
+mime_mhs_bodies         506
+id_hex_partial_message          507
+id_hex_multipart_message                508
+generationQualifier             509