backport cryptex to v2 branch#778

pabuhler wants to merge 2 commits intocisco:2_x_devcisco/libsrtp:2_x_devfrom

pabuhler:backport-cryptex-v2pabuhler/libsrtp:backport-cryptex-v2Copy head branch name to clipboard