Bug 11543 - Consider using cert-sh-functions

Summary: Consider using cert-sh-functions