tree b93d01886eb87e58384c4c188a40ad7ecf7bcb96
parent 8647e7c7f054636b354312e337025d8db9334430
author Jiayang Liu <jiayl@chromium.org> 1429916618 -0700
committer Jiayang Liu <jiayl@chromium.org> 1429916595 +0000

Merge r9061 to M43.

Original CR: https://webrtc-codereview.appspot.com/48209004/
Fix GetSignatureDigestAlgorithm for openssl to prepare for EC key switch.

TBR=juberti@google.com

BUG=479874

Review URL: https://webrtc-codereview.appspot.com/43309004

Cr-Commit-Position: refs/branch-heads/43@{#8}
Cr-Branched-From: 7351f4689caae2e53b3ee54874546e8aab769d22-refs/heads/master@{#8926}