diff -up nss/lib/ssl/sslsock.c.nobypass nss/lib/ssl/sslsock.c --- nss/lib/ssl/sslsock.c.nobypass 2013-05-30 22:23:37.305583715 -0700 +++ nss/lib/ssl/sslsock.c 2013-05-30 22:23:37.311583762 -0700 @@ -553,8 +553,10 @@ static PRStatus SSL_BypassRegisterShutdo static PRStatus SSL_BypassSetup(void) { #ifdef NO_PKCS11_BYPASS - /* Guarantee binary compatibility */ - return PR_SUCCESS; + /* No need in our case to guarantee binary compatibility and + * we can safely return failure as we have never supported it + */ + return PR_FAILURE; #else return PR_CallOnce(&setupBypassOnce, &SSL_BypassRegisterShutdown); #endif