projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update from stable branch.
[openssl.git]
/
crypto
/
objects
/
obj_mac.h
diff --git
a/crypto/objects/obj_mac.h
b/crypto/objects/obj_mac.h
index 491a1181db7fd3da60702d97194a8ec9231e1226..05fcbe7aa1f22b5ff3f6179c2b4b8adb054a2275 100644
(file)
--- a/
crypto/objects/obj_mac.h
+++ b/
crypto/objects/obj_mac.h
@@
-1030,6
+1030,11
@@
#define NID_ms_csp_name 417
#define OBJ_ms_csp_name 1L,3L,6L,1L,4L,1L,311L,17L,1L
#define NID_ms_csp_name 417
#define OBJ_ms_csp_name 1L,3L,6L,1L,4L,1L,311L,17L,1L
+#define SN_LocalKeySet "LocalKeySet"
+#define LN_LocalKeySet "Microsoft Local Key set"
+#define NID_LocalKeySet 856
+#define OBJ_LocalKeySet 1L,3L,6L,1L,4L,1L,311L,17L,2L
+
#define OBJ_certTypes OBJ_pkcs9,22L
#define LN_x509Certificate "x509Certificate"
#define OBJ_certTypes OBJ_pkcs9,22L
#define LN_x509Certificate "x509Certificate"