[Libreoffice-commits] core.git: 4 commits - external/liblangtag onlineupdate/Executable_mar.mk onlineupdate/source
Michael Stahl
mstahl at redhat.com
Wed Nov 4 04:24:48 PST 2015
external/liblangtag/ExternalProject_langtag.mk | 1 +
onlineupdate/Executable_mar.mk | 3 +++
onlineupdate/source/libmar/sign/mar_sign.c | 6 ++----
onlineupdate/source/libmar/src/mar_read.c | 2 ++
onlineupdate/source/libmar/verify/mar_verify.c | 4 ++--
onlineupdate/source/update/src/mar_read.c | 2 ++
6 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 219712eb61ee0cbb328de63cec89be98908bc1e7
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 4 13:21:00 2015 +0100
liblangtag: be more verbose when building
Change-Id: Ie5001ba809fcdd3f3abe1022ca7a152e01c3982c
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk
index 723d832..53a0fa3 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_ExternalProject_register_targets,langtag,\
$(call gb_ExternalProject_get_state_target,langtag,build):
$(call gb_ExternalProject_run,build,\
MAKE=$(MAKE) ./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \
+ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
commit 8d9e85ec5c2fa765696040f3c343d37cb52eead7
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 3 23:05:42 2015 +0100
onlineupdate: -Werror=unused-but-set-variable
Change-Id: I136eb25d2831cdbd3f1ce81714039cbd28b16577
diff --git a/onlineupdate/source/libmar/sign/mar_sign.c b/onlineupdate/source/libmar/sign/mar_sign.c
index 3e7ef20..68bff67 100644
--- a/onlineupdate/source/libmar/sign/mar_sign.c
+++ b/onlineupdate/source/libmar/sign/mar_sign.c
@@ -262,7 +262,7 @@ strip_signature_block(const char *src, const char * dest)
FILE *fpSrc = NULL, *fpDest = NULL;
int rv = -1, hasSignatureBlock;
char buf[BLOCKSIZE];
- char *indexBuf = NULL, *indexBufLoc;
+ char *indexBuf = NULL;
if (!src || !dest) {
fprintf(stderr, "ERROR: Invalid parameter passed in.\n");
@@ -432,7 +432,6 @@ strip_signature_block(const char *src, const char * dest)
/* Consume the index and adjust each index by the difference */
indexBuf = malloc(indexLength);
- indexBufLoc = indexBuf;
if (fread(indexBuf, indexLength, 1, fpSrc) != 1) {
fprintf(stderr, "ERROR: Could not read index\n");
goto failure;
@@ -836,7 +835,7 @@ mar_repackage_and_sign(const char *NSSConfigDir,
char buf[BLOCKSIZE];
SECKEYPrivateKey *privKeys[MAX_SIGNATURES];
CERTCertificate *certs[MAX_SIGNATURES];
- char *indexBuf = NULL, *indexBufLoc;
+ char *indexBuf = NULL;
uint32_t k;
memset(signatureLengths, 0, sizeof(signatureLengths));
@@ -1058,7 +1057,6 @@ mar_repackage_and_sign(const char *NSSConfigDir,
/* Consume the index and adjust each index by signatureSectionLength */
indexBuf = malloc(indexLength);
- indexBufLoc = indexBuf;
if (fread(indexBuf, indexLength, 1, fpSrc) != 1) {
fprintf(stderr, "ERROR: Could not read index\n");
goto failure;
diff --git a/onlineupdate/source/libmar/verify/mar_verify.c b/onlineupdate/source/libmar/verify/mar_verify.c
index c9f715a..c07ca20 100644
--- a/onlineupdate/source/libmar/verify/mar_verify.c
+++ b/onlineupdate/source/libmar/verify/mar_verify.c
@@ -13,6 +13,7 @@
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
+#include <assert.h>
#include "mar_private.h"
#include "mar.h"
#include "cryptox.h"
@@ -197,7 +198,6 @@ mar_extract_and_verify_signatures_fp(FILE *fp,
uint32_t signatureCount, signatureLen, numVerified = 0;
uint32_t signatureAlgorithmIDs[MAX_SIGNATURES];
int rv = -1;
- int64_t curPos;
uint8_t *extractedSignatures[MAX_SIGNATURES];
uint32_t i;
@@ -285,7 +285,6 @@ mar_extract_and_verify_signatures_fp(FILE *fp,
}
}
- curPos = ftello(fp);
rv = mar_verify_signatures_for_fp(fp,
provider,
keys,
@@ -299,6 +298,7 @@ mar_extract_and_verify_signatures_fp(FILE *fp,
/* If we reached here and we verified every
signature, return success. */
if (numVerified == signatureCount && keyCount == numVerified) {
+ assert(rv == 0); (void) rv;
return CryptoX_Success;
}
commit 53433719f6449dfa2597c11aba24d82382479ec3
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 3 22:31:03 2015 +0100
onlineupdate: -Werror=unused-variable
There are actually 2 identical copies of the file in onlineupdate! WTF?
Change-Id: I967bd90045ca0f56db151dd82d3baf8e848a8863
diff --git a/onlineupdate/source/libmar/src/mar_read.c b/onlineupdate/source/libmar/src/mar_read.c
index c7c4bdf..34f8e80 100644
--- a/onlineupdate/source/libmar/src/mar_read.c
+++ b/onlineupdate/source/libmar/src/mar_read.c
@@ -405,6 +405,8 @@ mar_read_product_info_block(MarFile *mar,
&hasAdditionalBlocks,
&offsetAdditionalBlocks,
&numAdditionalBlocks);
+ if (ret)
+ return ret;
for (i = 0; i < numAdditionalBlocks; ++i) {
/* Read the additional block size */
if (fread(&additionalBlockSize,
diff --git a/onlineupdate/source/update/src/mar_read.c b/onlineupdate/source/update/src/mar_read.c
index c7c4bdf..34f8e80 100644
--- a/onlineupdate/source/update/src/mar_read.c
+++ b/onlineupdate/source/update/src/mar_read.c
@@ -405,6 +405,8 @@ mar_read_product_info_block(MarFile *mar,
&hasAdditionalBlocks,
&offsetAdditionalBlocks,
&numAdditionalBlocks);
+ if (ret)
+ return ret;
for (i = 0; i < numAdditionalBlocks; ++i) {
/* Read the additional block size */
if (fread(&additionalBlockSize,
commit 0bcdce24340e5d3c32733e2d7ec663dd182a5252
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 3 22:43:55 2015 +0100
onlineupdate: error: statement with no effect
Actually enable NSS on non-WNT/Mac platforms.
Change-Id: Ib465d0175878bc2846a4d779b3b34ca57e55462e
diff --git a/onlineupdate/Executable_mar.mk b/onlineupdate/Executable_mar.mk
index 7a42b3c..c2dccaf 100644
--- a/onlineupdate/Executable_mar.mk
+++ b/onlineupdate/Executable_mar.mk
@@ -24,7 +24,10 @@ $(eval $(call gb_Executable_add_libs,mar,\
))
endif
+ifeq ($(filter WNT MACOSX,$(OS)),)
$(eval $(call gb_Executable_use_externals,mar,nss3))
+$(eval $(call gb_Executable_add_defs,mar,-DMAR_NSS))
+endif
$(eval $(call gb_Executable_add_cobjects,mar,\
onlineupdate/source/libmar/src/mar_create \
More information about the Libreoffice-commits
mailing list