868b266451
(cherry picked from commit e423c360fd2670b151c8e61439b36a77c77f77c3) Conflicts: crypto/objects/obj_dat.h crypto/objects/obj_mac.num