configure.ac | 10 +++------- oox/source/crypto/CryptTools.cxx | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-)
New commits: commit 133d59adf744b2279a7d59071ca834ac766b9719 Author: Michael Stahl <mst...@redhat.com> Date: Fri Nov 1 12:17:32 2013 +0100 configure: build oox with NSS backend by default Because NSS libraries are dynamic and OpenSSL static, using NSS saves 1.5 MB in the oox library [even though it's not as 1337 apparently]: -rwxrwxr-x. 1 ms ms 8889575 2. Nov 13:45 libooxlo.so.nss -rwxrwxr-x. 1 ms ms 7773576 2. Nov 13:45 libooxlo.so.nss.stripped -rwxrwxr-x. 1 ms ms 10340276 2. Nov 13:37 libooxlo.so.openssl -rwxrwxr-x. 1 ms ms 9042216 2. Nov 13:37 libooxlo.so.openssl.stripped Change-Id: I387496ae364acb1286d753d52f04924631136750 diff --git a/configure.ac b/configure.ac index 99209b6..1c569af 100644 --- a/configure.ac +++ b/configure.ac @@ -8785,13 +8785,9 @@ nss - Mozilla's Network Security Services (NSS) ;; esac else - if test "$enable_openssl" = "yes"; then - AC_DEFINE(USE_TLS_OPENSSL) - TLS=OPENSSL - else - AC_DEFINE(USE_TLS_NSS) - TLS=NSS - fi + # default to using NSS, it results in smaller oox lib + AC_DEFINE(USE_TLS_NSS) + TLS=NSS fi AC_MSG_RESULT([$TLS]) AC_SUBST(TLS) commit 2ff7b04c1b205b14dc1bace1e90ee62d26db9643 Author: Michael Stahl <mst...@redhat.com> Date: Mon Nov 4 21:50:21 2013 +0100 oox: use proper integer type when calling PK11_DigestFinal Change-Id: I5ff79c55446bd9f3e350fb128793ffef51be843f diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx index a2a7573..6c46297 100644 --- a/oox/source/crypto/CryptTools.cxx +++ b/oox/source/crypto/CryptTools.cxx @@ -236,7 +236,7 @@ bool sha512(vector<sal_uInt8>& output, vector<sal_uInt8>& input) if (status != SECSuccess) return false; - sal_uInt32 outputLength = 0; + unsigned int outputLength = 0; status = PK11_DigestFinal(mContext, &output[0], &outputLength, SHA512_LENGTH); if (status != SECSuccess || outputLength != SHA512_LENGTH) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits