Bug 821855, SRTP fails to initialize on Android when crypto_kernel_init_ciphers fail their self tests, r=jesup
authorDan Mosedale <dmose@mozilla.org>
Mon, 17 Dec 2012 12:13:26 -0800
changeset 116310 9c21138d9e9ab3616a850948f7e3334886bd6dff
parent 116309 bc98fdc051f5c2f85f2a1951e625323266ad0777
child 116311 5a71c5b130c60f78c409cf6151c9411b49c2e069
push id24046
push useremorley@mozilla.com
push dateTue, 18 Dec 2012 09:32:10 +0000
treeherdermozilla-central@dd277d439d31 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs821855
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 821855, SRTP fails to initialize on Android when crypto_kernel_init_ciphers fail their self tests, r=jesup
netwerk/srtp/src/Makefile.in
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@@ -73,17 +73,25 @@ DEFINES += \
   -DHAVE_UINT32_T=1 \
   -DHAVE_UINT64_T=1 \
   $(NULL)
 
 # We know StandardInteger.h will define uint8/16/32/64_t, so we don't need
 # to define SIZEOF_UNSIGNED_LONG/SIZEOF_UNSIGNED_LONG_LONG
 
 ifeq ($(CPU_ARCH),arm)
-DEFINES += -DCPU_RISC=1
+
+# XXX while arm is not a CISC architecture, the code guarded by CPU_RISC makes
+# (at least) the AES ciphers fail their self-tests on ARM, so for now we're
+# falling back to the (presumably) slower-on-this-architecture but working
+# code path.  https://bugzilla.mozilla.org/show_bug.cgi?id=822380 has been filed
+# to make the right and more performant fix and push it back upstream.
+
+DEFINES += -DCPU_CISC=1
+
 else ifeq ($(CPU_ARCH),x86)
 DEFINES += \
   -DCPU_CISC=1 \
   -DHAVE_X86 \
   $(NULL)
 else ifeq ($(CPU_ARCH),x86_64)
 DEFINES += \
   -DCPU_CISC=1 \