diff options
| author | markus <> | 2003-05-12 02:18:40 +0000 |
|---|---|---|
| committer | markus <> | 2003-05-12 02:18:40 +0000 |
| commit | d4fcd82bb7f6d603bd61e19a81ba97337b89dfca (patch) | |
| tree | d52e3a0f1f08f65ad283027e560e17ed0d720462 /src/lib/libcrypto/objects/objects.txt | |
| parent | 582bbd139cd2afd58d10dc051c5b0b989b441074 (diff) | |
| download | openbsd-d4fcd82bb7f6d603bd61e19a81ba97337b89dfca.tar.gz openbsd-d4fcd82bb7f6d603bd61e19a81ba97337b89dfca.tar.bz2 openbsd-d4fcd82bb7f6d603bd61e19a81ba97337b89dfca.zip | |
merge 0.9.7b with local changes; crank majors for libssl/libcrypto
Diffstat (limited to 'src/lib/libcrypto/objects/objects.txt')
| -rw-r--r-- | src/lib/libcrypto/objects/objects.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libcrypto/objects/objects.txt b/src/lib/libcrypto/objects/objects.txt index 71a4908485..3ba11f65cc 100644 --- a/src/lib/libcrypto/objects/objects.txt +++ b/src/lib/libcrypto/objects/objects.txt | |||
| @@ -276,6 +276,10 @@ rsadsi 3 8 : RC5-CBC : rc5-cbc | |||
| 276 | 1 3 6 1 4 1 311 10 3 3 : msSGC : Microsoft Server Gated Crypto | 276 | 1 3 6 1 4 1 311 10 3 3 : msSGC : Microsoft Server Gated Crypto |
| 277 | !Cname ms-efs | 277 | !Cname ms-efs |
| 278 | 1 3 6 1 4 1 311 10 3 4 : msEFS : Microsoft Encrypted File System | 278 | 1 3 6 1 4 1 311 10 3 4 : msEFS : Microsoft Encrypted File System |
| 279 | !Cname ms-smartcard-login | ||
| 280 | 1 3 6 1 4 1 311 20 2 2 : msSmartcardLogin : Microsoft Smartcardlogin | ||
| 281 | !Cname ms-upn | ||
| 282 | 1 3 6 1 4 1 311 20 2 3 : msUPN : Microsoft Universal Principal Name | ||
| 279 | 283 | ||
| 280 | 1 3 6 1 4 1 188 7 1 1 2 : IDEA-CBC : idea-cbc | 284 | 1 3 6 1 4 1 188 7 1 1 2 : IDEA-CBC : idea-cbc |
| 281 | : IDEA-ECB : idea-ecb | 285 | : IDEA-ECB : idea-ecb |
| @@ -537,7 +541,7 @@ X509 11 : OU : organizationalUnitName | |||
| 537 | X509 12 : : title | 541 | X509 12 : : title |
| 538 | X509 13 : : description | 542 | X509 13 : : description |
| 539 | X509 41 : name : name | 543 | X509 41 : name : name |
| 540 | X509 42 : gn : givenName | 544 | X509 42 : GN : givenName |
| 541 | X509 43 : : initials | 545 | X509 43 : : initials |
| 542 | X509 44 : : generationQualifier | 546 | X509 44 : : generationQualifier |
| 543 | X509 45 : : x500UniqueIdentifier | 547 | X509 45 : : x500UniqueIdentifier |