diff options
| author | djm <> | 2009-01-09 12:15:52 +0000 |
|---|---|---|
| committer | djm <> | 2009-01-09 12:15:52 +0000 |
| commit | eef32868c6aa961f0ae29b5a113d0690dc4db25e (patch) | |
| tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/objects/obj_mac.num | |
| parent | ed26972d251de1f03147983371ecfba887241c5e (diff) | |
| download | openbsd-eef32868c6aa961f0ae29b5a113d0690dc4db25e.tar.gz openbsd-eef32868c6aa961f0ae29b5a113d0690dc4db25e.tar.bz2 openbsd-eef32868c6aa961f0ae29b5a113d0690dc4db25e.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/objects/obj_mac.num')
| -rw-r--r-- | src/lib/libcrypto/objects/obj_mac.num | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libcrypto/objects/obj_mac.num b/src/lib/libcrypto/objects/obj_mac.num index 53c9cb0d6a..e3f56bc52c 100644 --- a/src/lib/libcrypto/objects/obj_mac.num +++ b/src/lib/libcrypto/objects/obj_mac.num | |||
| @@ -854,3 +854,5 @@ id_GostR3411_94_with_GostR3410_2001_cc 853 | |||
| 854 | id_GostR3410_2001_ParamSet_cc 854 | 854 | id_GostR3410_2001_ParamSet_cc 854 |
| 855 | hmac 855 | 855 | hmac 855 |
| 856 | LocalKeySet 856 | 856 | LocalKeySet 856 |
| 857 | freshest_crl 857 | ||
| 858 | id_on_permanentIdentifier 858 | ||