message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
fpgad: fix error in sysfs path to match N5010 | @@ -428,6 +428,8 @@ STATIC const char *glob_patterns[] = {
"*-hwmon.*.auto/hwmon/hwmon*/*_label",
"/sys/bus/pci/devices/%s/fpga_region/region*/dfl-fme.*/"
"dfl_dev.*/*-hwmon.*.auto/hwmon/hwmon*/*_label",
+ "/sys/bus/pci/devices/%s/fpga_region/region*/dfl-fme.*/"
+ "dfl_dev.*/spi*/spi*/spi*/*-hwmon.*.auto/hwmon/hwmon*/*_label",
NULL
};
|
Doxygen: Added clear statements that we use C99/C++03 standards, not original ANSI C89. | @@ -76,7 +76,7 @@ In detail the benefits of the CMSIS are:
\section CodingRules Coding Rules
The CMSIS uses the following essential coding rules and conventions:
- - Compliant with ANSI C and C++.
+ - Compliant with ANSI C (C99) and C++ (C++03).
- Uses ANSI C standard data types defined in \b <stdint.h>.
- Variables and parameters have a complete data type.
- Expressions for \em \#define constants are enclosed in parenthesis.
|
fixed rt_kprintf %s precision print error. | @@ -922,7 +922,7 @@ rt_int32_t rt_vsnprintf(char *buf,
s = va_arg(args, char *);
if (!s) s = "(NULL)";
- len = rt_strlen(s);
+ for (len = 0; (len != field_width) && (s[len] != '\0'); len++);
#ifdef RT_PRINTF_PRECISION
if (precision > 0 && len > precision) len = precision;
#endif
|
fix compilation flags for cpp -> fix reprotest for oidc-prompt | @@ -124,10 +124,20 @@ CC := $(CC)
CXX := $(CXX)
# compiling flags here
CFLAGS := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common
+CPPFLAGS := $(CPPFLAGS) -g -I$(SRCDIR) -I$(LIBDIR)
+ifdef MAC_OS
+CPPFLAGS += -std=c++11
+else
+ifndef ANY_MSYS
+CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 webkit2gtk-4.0) -lstdc++
+endif
+endif
ifndef MAC_OS
ifndef NODPKG
CFLAGS +=$(shell dpkg-buildflags --get CPPFLAGS)
+ CPPFLAGS +=$(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS +=$(shell dpkg-buildflags --get CFLAGS)
+ CPPFLAGS +=$(shell dpkg-buildflags --get CFLAGS)
endif
# Use PKG_CONFIG_PATH
ifdef ANY_MSYS
@@ -138,14 +148,6 @@ else
endif
endif
TEST_CFLAGS = $(CFLAGS) -I.
-CPPFLAGS := $(CPPFLAGS) -g -I$(SRCDIR) -I$(LIBDIR)
-ifdef MAC_OS
-CPPFLAGS += -std=c++11
-else
-ifndef ANY_MSYS
-CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 webkit2gtk-4.0) -lstdc++
-endif
-endif
# Linker options
LINKER := $(CC)
|
chore(docs) run makeindex before xelatex | @@ -60,6 +60,7 @@ cmd("cd ../scripts && doxygen Doxyfile")
cmd("sphinx-build -b latex . out_latex")
# Generate PDF
+cmd("cd out_latex && makeindex -s python.ist -o LVGL.ind LVGL.idx")
cmd("cd out_latex && xelatex -interaction=batchmode *.tex")
# Copy the result PDF to the main directory to make it avaiable for the HTML build
cmd("cd out_latex && cp -f LVGL.pdf ../LVGL.pdf")
|
Add GIT_SUBMODULE_STRATEGY to variable to ci file | image: gcc
Linux_Secured_Test:
+ variables:
+ GIT_SUBMODULE_STRATEGY: normal
stage: build
before_script:
- apt update && apt -y install make autoconf
@@ -13,6 +15,8 @@ Linux_Secured_Test:
- make DYNAMIC=1 IPV4=1 TCP=1 SECURE=1 test
Linux_Unsecured_Test:
+ variables:
+ GIT_SUBMODULE_STRATEGY: normal
stage: build
before_script:
- apt update && apt -y install make autoconf
@@ -24,6 +28,8 @@ Linux_Unsecured_Test:
- make DYNAMIC=1 IPV4=1 TCP=1 SECURE=0 test
Android_build:
+ variables:
+ GIT_SUBMODULE_STRATEGY: normal
stage: build
image: openjdk:8-jdk
before_script:
@@ -47,6 +53,8 @@ Android_build:
- make DYNAMIC=1 TCP=1 IPV4=1 SECURE=1 PKI=1 CLOUD=1 JAVA=1 DEBUG=0
whitespace_and_doxygen:
+ variables:
+ GIT_SUBMODULE_STRATEGY: none
stage: build
before_script:
- apt update && apt -y install make autoconf doxygen clang-format
|
Add inspect for function in node async test. | @@ -39,8 +39,9 @@ TEST_F(metacall_node_async_test, DefaultConstructor)
#if defined(OPTION_BUILD_LOADERS_NODE)
{
const char buffer[] =
+ "const util = require('util');\n"
"function f(x) {\n"
- "\treturn new Promise(r => console.log(`Promise executed: ${x}`) || r(x));\n"
+ "\treturn new Promise(r => console.log(`Promise executed: ${util.inspect(r)} -> ${x}`) || r(x));\n"
"}\n"
"module.exports = { f };\n";
|
Use wrapper script for macOS signing | @@ -241,8 +241,7 @@ pipeline {
withCredentials([usernamePassword(credentialsId: 'win-signing',
usernameVariable: 'USERNAME',
passwordVariable: 'PASSWORD')]) {
- sh 'python3 ./signing/macos-client.py -t mach-o --timestamp-server default --signature-flag runtime --deep ${USERNAME} *.zip *.zip'
- sh 'rm -rf ./signing'
+ sh 'python3 ./signing/macos-client-wrapper.py ${USERNAME} *.zip'
}
}
dir('upload') {
|
updating eigenvector expression verbiage | @@ -670,7 +670,7 @@ Tensor Expressions
Eigenvalue: ``eigenvalue(expr)``
The ``expr`` must evaluate to a 3x3 *symmetric* tensor. The eigenvalue
- expression returns the eigenvalues of the 3x3 matrix *symmetric* argument
+ expression returns the eigenvalues of the 3x3 *symmetric* matrix argument
as a vector valued expression where each eigenvalue is a component of
the vector. Use the component index operator ('[]') to access individual
eigenvalues.
@@ -685,7 +685,6 @@ Eigenvector: ``eigenvector(expr)``
``evecs = transpose(eigenvector(tensor))``, the expression ``evecs[1]``
will return the second eigenvector.
-
Array Expressions
"""""""""""""""""
|
Fix tuya_pulsar
1. Use tcp instead of tcp4
2. Run pulsar handler as goroutine | @@ -412,5 +412,6 @@ ALLOW yabs/telephony/platform/internal/rtp -> vendor/github.com/wernerd/GoRTP
# CONTRIB-1518 client for monkey-patched Apache Pulsar by TuyaInc. responsible: jock@
ALLOW quasar/iot/adapters/tuya_adapter -> vendor/github.com/TuyaInc/tuya_pulsar_sdk_go
+ALLOW quasar/iot/adapters/tuya_adapter/server -> vendor/github.com/sirupsen/logrus
DENY .* -> vendor/
|
add information for build-release -2 | @@ -20,5 +20,9 @@ oidc-agent (4.0.2-2) UNRELEASED; urgency=medium
* Add -z now to LDFLAGS
* Update to upstream version 4.0.2
* Adjust .install files for Build in debian/tmp
+ * Drop build dependency for clibs/list (and use the shipped version)
+ * Add clibs and cjson authors to copyright
+ * Do not modify /etc/X11/Xsession.options on installation (assume
+ use-oidc-agent is set)
-- Marcus Hardt <[email protected]> Fri, 09 Oct 2020 21:33:36 +0200
|
Work CI-CD
Add option to Cloudsmith CLI to allow republish of package with same version. (usefull for re-running a pipeline)
***NO_CI*** | @@ -117,7 +117,7 @@ steps:
Write-Host "Uploading $(PUBLISHING_PACKAGE_NAME) v$(PACKAGE_VERSION)"
- cloudsmith push raw net-nanoframework/$(CLOUDSMITH_REPO) $(Agent.TempDirectory)\$(PUBLISHING_PACKAGE_NAME).zip --name $(TargetPublishName) --version $(PACKAGE_VERSION) --tags $(TargetPlatform),$(TargetSeries) -k $(CLOUDSMITH_KEY)
+ cloudsmith push raw net-nanoframework/$(CLOUDSMITH_REPO) $(Agent.TempDirectory)\$(PUBLISHING_PACKAGE_NAME).zip --name $(TargetPublishName) --version $(PACKAGE_VERSION) --tags $(TargetPlatform),$(TargetSeries) --republish -k $(CLOUDSMITH_KEY)
errorActionPreference: 'stop'
failOnStderr: 'false'
|
Changed to apply oversampling after image size estimation | @@ -142,10 +142,16 @@ int main_nlinv(int argc, char* argv[])
traj = load_cfl(trajectory, DIMS, trj_dims);
- md_zsmul(DIMS, trj_dims, traj, traj, 2.);
-
estimate_im_dims(DIMS, FFT_FLAGS, dims, trj_dims, traj);
debug_printf(DP_INFO, "Est. image size: %ld %ld %ld\n", dims[0], dims[1], dims[2]);
+
+ md_zsmul(DIMS, trj_dims, traj, traj, 2.);
+ for (unsigned int i = 0; i < DIMS; i++)
+ if (MD_IS_SET(FFT_FLAGS, i) && (1 < dims[i])) {
+
+ dims[i] *= 2;
+ }
+
md_copy_dims(DIMS - 3, dims + 3, ksp_dims + 3);
}
|
hark-store: do not give all notifications in +on-watch | [%count unread-count]
%+ weld
%+ turn
- (tap-nonempty archive)
+ %+ scag 5
+ (tap-nonempty:ha archive)
(timebox-update &)
%+ turn
- (tap-nonempty notifications)
+ %+ scag 5
+ (tap-nonempty:ha notifications)
(timebox-update |)
::
++ timebox-update
|= [time=@da =timebox:store]
^- update:store
[%timebox time archived ~(tap by timebox)]
- ::
- ++ tap-nonempty
- |= =notifications:store
- ^- (list [@da timebox:store])
- %+ skip (tap:orm notifications)
- |=([@da =timebox:store] =(0 ~(wyt by timebox)))
--
::
++ on-peek
(slav %ud i.t.t.path)
=/ length=@ud
(slav %ud i.t.t.t.path)
- :^ ~ ~ %noun
+ :^ ~ ~ %hark-update
!> ^- update:store
:- %more
%+ turn
- (scag length (slag offset (tap:orm notifications)))
+ %+ scag length
+ %+ slag offset
+ (tap-nonempty:ha notifications)
|= [time=@da =timebox:store]
^- update:store
:^ %timebox time %.n
|_ =bowl:gall
+* met ~(. metadata bowl)
::
+++ tap-nonempty
+ |= =notifications:store
+ ^- (list [@da timebox:store])
+ %+ skip (tap:orm notifications)
+ |=([@da =timebox:store] =(0 ~(wyt by timebox)))
+::
++ merge-notification
|= [existing=notification:store new=notification:store]
^- notification:store
|
Android does not have librt | @@ -156,6 +156,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
set(OS_LIBS thr)
elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
set(OS_LIBS Threads::Threads)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
+ set(OS_LIBS Threads::Threads dl)
else()
set(OS_LIBS Threads::Threads dl rt)
endif()
|
please doxygen | @@ -600,6 +600,7 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
* These increase verbosity as specified in the config file.
* @param debug_mode: if set, do not daemonize.
* @param log_default_identity: Default identity to report in logs
+ * @param need_pidfile: if false, no pidfile is checked or created.
*/
static void
run_daemon(const char* cfgfile, int cmdline_verbose, int debug_mode, const char* log_default_identity, int need_pidfile)
|
Add Cipersuite selection negative testing by using invalid algs for server-side opaque key | @@ -1735,6 +1735,23 @@ run_test "TLS-ECDHE-RSA Opaque key for client authentication" \
-S "error" \
-C "error"
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
+requires_config_enabled MBEDTLS_USE_PSA_CRYPTO
+requires_config_enabled MBEDTLS_X509_CRT_PARSE_C
+requires_config_enabled MBEDTLS_ECDSA_C
+requires_config_enabled MBEDTLS_SHA256_C
+run_test "TLS-ECDHE-ECDSA Opaque key for server authentication, invalid algs" \
+ "$P_SRV auth_mode=required key_opaque=1 crt_file=data_files/server5.crt \
+ key_file=data_files/server5.key key_opaque_algs=rsa-decrypt,none \
+ debug_level=1" \
+ "$P_CLI crt_file=data_files/server5.crt \
+ key_file=data_files/server5.key" \
+ 1 \
+ -s "key types: Opaque, none" \
+ -s "got ciphersuites in common, but none of them usable" \
+ -s "error" \
+ -c "error"
+
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_config_enabled MBEDTLS_USE_PSA_CRYPTO
requires_config_enabled MBEDTLS_X509_CRT_PARSE_C
@@ -1802,6 +1819,24 @@ run_test "TLS-ECDHE-ECDSA Opaque key for server authentication" \
-S "error" \
-C "error"
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
+requires_config_enabled MBEDTLS_USE_PSA_CRYPTO
+requires_config_enabled MBEDTLS_X509_CRT_PARSE_C
+requires_config_enabled MBEDTLS_ECDSA_C
+requires_config_enabled MBEDTLS_RSA_C
+requires_config_enabled MBEDTLS_SHA256_C
+run_test "TLS-ECDHE-RSA Opaque key for server authentication, invalid algs" \
+ "$P_SRV auth_mode=required key_opaque=1 crt_file=data_files/server2-sha256.crt \
+ key_file=data_files/server2.key key_opaque_algs=ecdh,none \
+ debug_level=1" \
+ "$P_CLI crt_file=data_files/server2-sha256.crt \
+ key_file=data_files/server2.key" \
+ 1 \
+ -s "key types: Opaque, none" \
+ -s "got ciphersuites in common, but none of them usable" \
+ -s "error" \
+ -c "error"
+
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_config_enabled MBEDTLS_USE_PSA_CRYPTO
requires_config_enabled MBEDTLS_X509_CRT_PARSE_C
|
system/nxplayer/nxplayer_main.c: fix '%d' missing in sscanf | @@ -332,7 +332,7 @@ static int nxplayer_cmd_playraw(FAR struct nxplayer_s *pplayer, char *parg)
int chmap = 0;
char filename[128];
- sscanf(parg, "%s %d %d %d", filename, &channels, &bpsamp,
+ sscanf(parg, "%s %d %d %d %d", filename, &channels, &bpsamp,
&samprate, &chmap);
/* Try to play the file specified */
|
Fix possible leaks on sk_X509_EXTENSION_push() failure ... | @@ -54,6 +54,7 @@ const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid)
X509V3_EXT_METHOD tmp;
const X509V3_EXT_METHOD *t = &tmp, *const *ret;
int idx;
+
if (nid < 0)
return NULL;
tmp.ext_nid = nid;
@@ -165,6 +166,7 @@ void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
{
int lastpos, i;
X509_EXTENSION *ex, *found_ex = NULL;
+
if (!x) {
if (idx)
*idx = -1;
@@ -218,9 +220,9 @@ void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
int crit, unsigned long flags)
{
- int extidx = -1;
- int errcode;
- X509_EXTENSION *ext, *extmp;
+ int errcode, extidx = -1;
+ X509_EXTENSION *ext = NULL, *extmp;
+ STACK_OF(X509_EXTENSION) *ret = NULL;
unsigned long ext_op = flags & X509V3_ADD_OP_MASK;
/*
@@ -279,14 +281,23 @@ int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
return 1;
}
+ ret = *x;
if (*x == NULL
- && (*x = sk_X509_EXTENSION_new_null()) == NULL)
- return -1;
- if (!sk_X509_EXTENSION_push(*x, ext))
- return -1;
+ && (ret = sk_X509_EXTENSION_new_null()) == NULL)
+ goto m_fail;
+ if (!sk_X509_EXTENSION_push(ret, ext))
+ goto m_fail;
+ *x = ret;
return 1;
+ m_fail:
+ /* X509V3err(X509V3_F_X509V3_ADD1_I2D, ERR_R_MALLOC_FAILURE); */
+ if (ret != *x)
+ sk_X509_EXTENSION_free(ret);
+ X509_EXTENSION_free(ext);
+ return -1;
+
err:
if (!(flags & X509V3_ADD_SILENT))
X509V3err(X509V3_F_X509V3_ADD1_I2D, errcode);
|
fixed gcc warning on arm | @@ -265,7 +265,7 @@ else
if(!EVP_MAC_init(ctxhmac, pmkcalculated, 32, paramssha1)) return false;
if(!EVP_MAC_update(ctxhmac, ptkcalculated, 100)) return false;
-if(!EVP_MAC_final(ctxhmac, ptkcalculated, NULL, 256)) return false;
+if(!EVP_MAC_final(ctxhmac, ptkcalculated, NULL, 64)) return false;
return true;
}
/*===========================================================================*/
@@ -621,7 +621,7 @@ if(pskstring != NULL)
{
if(hex2bin(pskstring, pmkcalculated, 32) != 32)
{
- fprintf(stderr, "\nPMK error %ld\n", strlen(pskstring));
+ fprintf(stderr, "\nPMK error\n");
return EXIT_FAILURE;
}
status |= HAS_PMK;
|
board/goroh/led.c: Format with clang-format
BRANCH=none
TEST=none | struct pwm_led_color_map led_color_map[EC_LED_COLOR_COUNT] = {
/* Green, Red */
- [EC_LED_COLOR_RED] = { 0, 100 },
- [EC_LED_COLOR_GREEN] = { 100, 0 },
- [EC_LED_COLOR_BLUE] = { 0, 0 },
- [EC_LED_COLOR_YELLOW] = { 0, 0 },
- [EC_LED_COLOR_WHITE] = { 0, 0 },
- [EC_LED_COLOR_AMBER] = { 0, 0 },
+ [EC_LED_COLOR_RED] = { 0, 100 }, [EC_LED_COLOR_GREEN] = { 100, 0 },
+ [EC_LED_COLOR_BLUE] = { 0, 0 }, [EC_LED_COLOR_YELLOW] = { 0, 0 },
+ [EC_LED_COLOR_WHITE] = { 0, 0 }, [EC_LED_COLOR_AMBER] = { 0, 0 },
};
struct pwm_led pwm_leds[CONFIG_LED_PWM_COUNT] = {
|
Wait for buffer status on lpc11u35 EP read | @@ -505,6 +505,7 @@ U32 USBD_ReadEP(U32 EPNum, U8 *pData, U32 size)
volatile U32 *ptr;
U8 *dataptr;
ptr = GetEpCmdStatPtr(EPNum);
+ int timeout = 256;
/* Setup packet */
if ((EPNum == 0) && !ctrl_out_next && (LPC_USB->DEVCMDSTAT & (1UL << 8))) {
@@ -552,7 +553,8 @@ U32 USBD_ReadEP(U32 EPNum, U8 *pData, U32 size)
cnt = EPBufInfo[EP_OUT_IDX(EPNum)].buf_len - ((*ptr >> 16) & 0x3FF);
dataptr = (U8 *)EPBufInfo[EP_OUT_IDX(EPNum)].buf_ptr;
- util_assert(!(*ptr & BUF_ACTIVE));
+ while ((timeout-- > 0) && (*ptr & BUF_ACTIVE)); //spin on the hardware until it's done
+ util_assert(!(*ptr & BUF_ACTIVE)); //check for timeout
if (size < cnt) {
util_assert(0);
|
[io] vview.py, fix broken siconos_vview | @@ -77,6 +77,7 @@ class VViewOptions(object):
self.initial_camera = [None] * 4
self.visible_mode = 'all'
self.export = False
+ self.gen_para_script = False
## Print usage information
def usage(self, long=False):
@@ -2307,7 +2308,7 @@ class VView(object):
add_compatiblity_methods(self.big_data_mapper)
self.big_data_mapper.SetInputConnection(self.big_data_collector.GetOutputPort())
- if self.opts.imr:
+ if not self.opts.imr:
self.big_data_mapper.ImmediateModeRenderingOff()
self.big_actor = vtk.vtkActor()
|
Fix model_size_reg description. | @@ -1283,7 +1283,7 @@ class CatBoostClassifier(CatBoost):
l2_leaf_reg : int, [default=3]
L2 regularization term on weights.
range: [0,+inf]
- model_size_reg : int, [default=None]
+ model_size_reg : float, [default=None]
Model size regularization coefficient.
range: [0,+inf]
rsm : float, [default=None]
|
mode debug spew to thread_log | @@ -664,7 +664,7 @@ sysreturn open_internal(tuple root, char *name, int flags, int mode)
if ((flags & O_CREAT)) {
if (n && (flags & O_EXCL)) {
- msg_err("\"%s\" opened with O_EXCL but already exists\n", name);
+ thread_log(current, "\"%s\" opened with O_EXCL but already exists\n", name);
return set_syscall_error(current, EEXIST);
} else if (!n) {
sysreturn rv = do_mkent(0, name, mode, false);
@@ -677,7 +677,7 @@ sysreturn open_internal(tuple root, char *name, int flags, int mode)
}
if (!n) {
- msg_err("\"%s\" - not found\n", name);
+ thread_log(current, "\"%s\" - not found\n", name);
return set_syscall_error(current, ENOENT);
}
u64 length = 0;
@@ -685,7 +685,7 @@ sysreturn open_internal(tuple root, char *name, int flags, int mode)
if (!is_dir(n) && !is_special(n)) {
fsf = fsfile_from_node(current->p->fs, n);
if (!fsf) {
- msg_err("\"%s\": can't find corresponding fsfile (%t)\n", name, n);
+ thread_log(current, "\"%s\": can't find corresponding fsfile (%t)\n", name, n);
return set_syscall_error(current, ENOENT);
}
length = fsfile_get_length(fsf);
@@ -693,12 +693,12 @@ sysreturn open_internal(tuple root, char *name, int flags, int mode)
// might be functional, or be a directory
file f = unix_cache_alloc(uh, file);
if (f == INVALID_ADDRESS) {
- msg_err("failed to allocate struct file\n");
+ thread_log(current, "failed to allocate struct file");
return set_syscall_error(current, ENOMEM);
}
int fd = allocate_fd(current->p, f);
if (fd == INVALID_PHYSICAL) {
- msg_err("failed to allocate fd\n");
+ thread_log(current, "failed to allocate fd");
unix_cache_free(uh, file, f);
return set_syscall_error(current, EMFILE);
}
|
cherry: enable HOST_SLEEP_STATE
Port CL:2954984 to Cherry.
TEST=make
BRANCH=main
Tested-by: Ting Shen | #define CONFIG_CHIPSET_MT8192
#define CONFIG_EXTPOWER_GPIO
#define CONFIG_HIBERNATE_WAKE_PINS_DYNAMIC
+#define CONFIG_POWER_SLEEP_FAILURE_DETECTION
+#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE
/* Chipset */
#define CONFIG_CMD_AP_RESET_LOG
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED) | \
EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) | \
EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) | \
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_HANG_DETECT) | \
EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE) | \
EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
|
VERSION bump to version 0.9.22 | @@ -28,7 +28,7 @@ set(CMAKE_C_FLAGS_DEBUG "-g -O0")
# set version
set(LIBNETCONF2_MAJOR_VERSION 0)
set(LIBNETCONF2_MINOR_VERSION 9)
-set(LIBNETCONF2_MICRO_VERSION 21)
+set(LIBNETCONF2_MICRO_VERSION 22)
set(LIBNETCONF2_VERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION}.${LIBNETCONF2_MICRO_VERSION})
set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION})
|
Fix showing thread stack window after an error | @@ -807,7 +807,11 @@ static INT_PTR CALLBACK PhpThreadStackDlgProc(
if (status == STATUS_ABANDONED)
EndDialog(hwndDlg, IDCANCEL);
else if (!NT_SUCCESS(status))
- PhShowStatus(hwndDlg, L"Unable to load the stack", status, 0);
+ {
+ // HACK: Show error dialog on the parent window.
+ PhShowStatus(GetParent(hwndDlg), L"Unable to load the stack.", status, 0);
+ EndDialog(hwndDlg, IDCANCEL);
+ }
}
break;
case WM_DESTROY:
@@ -850,7 +854,7 @@ static INT_PTR CALLBACK PhpThreadStackDlgProc(
if (!NT_SUCCESS(status = PhpRefreshThreadStack(hwndDlg, context)))
{
- PhShowStatus(hwndDlg, L"Unable to load the stack", status, 0);
+ PhShowStatus(hwndDlg, L"Unable to refresh the stack.", status, 0);
}
}
break;
|
network/lwIP: fix svace issue WGID 503869
fix svace issue WGID 503869 | @@ -670,14 +670,9 @@ struct tcp_pcb *tcp_listen_with_backlog_and_err(struct tcp_pcb *pcb, u8_t backlo
err_t res;
LWIP_UNUSED_ARG(backlog);
+ LWIP_ERROR("tcp_listen_with_backlog_and_err: invalid pcb", pcb != NULL, res = ERR_ARG; goto done);
LWIP_ERROR("tcp_listen: pcb already connected", pcb->state == CLOSED, res = ERR_CLSD; goto done);
- /* already listening? */
- if (pcb->state == LISTEN) {
- lpcb = (struct tcp_pcb_listen *)pcb;
- res = ERR_ALREADY;
- goto done;
- }
#if SO_REUSE
if (ip_get_option(pcb, SOF_REUSEADDR)) {
/* Since SOF_REUSEADDR allows reusing a local address before the pcb's usage
|
Fix VMS installation - Check the presence of providers in the IVP script | @@ -41,6 +41,12 @@ $
$ ! FUTURE ENHANCEMENT: Verify that engines are where they should be.
$ ! openssl engine -c -t checker
$
+$ ! Verify that the built in providers are reachable. If they aren't,
+$ ! then we're likely to get an image activation error here
+$ openssl list -provider base -providers
+$ openssl list -provider default -providers
+$ openssl list -provider legacy -providers
+$
$ WRITE SYS$ERROR "OpenSSL IVP passed"
$ EXIT %x10000001
$
|
Docs: Update source-out policy note
Now that the full source-out policy has been implemented in the TCPMv2
DPM, modify the previous note about implementation.
BRANCH=None
TEST=view in Chrome with Markdown Preview Plus | @@ -135,8 +135,9 @@ in-depth information can be found in the [USB Type-C Specification] \(section
### ChromeOS as Source - Policy for Type-C
-**Note:** Behavior outlined in this .md file reflects future-planned behavior,
-and is not present in the codebase currently.
+**Note:** Behavior outlined here is only implemented in the TCPMv2 Device
+Policy Manager (DPM) when a board defines a non-zero maximum number of 3A
+ports supported through `CONFIG_USB_PD_3A_PORTS`.
ChromeOS devices currently source power to external USB devices at 5V with a
typical current of 1.5A for each Type-C port. In certain scenarios, a Type-C
|
punisher update | @@ -442,7 +442,7 @@ DWORD WINAPI Init(LPVOID bDelay)
for (size_t i = 0; i < std::size(menuBackgrounds); ++i)
{
- if (memstr(str, menuBackgrounds[i], 0x100) != NULL)
+ if (memstr(str, menuBackgrounds[i], 0x60) != NULL)
{
regs.eax += 1;
break;
|
regional_alloc + memcpy to regional_alloc_init | @@ -477,12 +477,11 @@ generate_keytag_query(struct module_qstate* qstate, int id,
sldns_str2wire_dname_buf_origin(tagstr, dnamebuf, &dnamebuf_len,
ta->name, ta->namelen);
- if(!(keytagdname = (uint8_t*)regional_alloc(qstate->region,
- dnamebuf_len))) {
+ if(!(keytagdname = (uint8_t*)regional_alloc_init(qstate->region,
+ dnamebuf, dnamebuf_len))) {
log_err("could not generate key tag query: out of memory");
return 0;
}
- memcpy(keytagdname, dnamebuf, dnamebuf_len);
log_nametypeclass(VERB_ALGO, "keytag query", keytagdname,
LDNS_RR_TYPE_NULL, ta->dclass);
|
Remove oc_obt from server build.
oc_obt.c requires client functions. Hence,
drop it from the server-only libraries.
Tested-by: Kishen Maloor | @@ -43,7 +43,7 @@ HEADERS_TINYCBOR = $(wildcard ../../deps/tinycbor/src/*.h)
CFLAGS=-fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I./ -I../../include/ -I../../ -std=gnu99 -Wall -Wextra -Werror -pedantic #-Wl,-Map,client.map
OBJ_COMMON=$(addprefix obj/,$(notdir $(SRC_COMMON:.c=.o)))
OBJ_CLIENT=$(addprefix obj/client/,$(notdir $(SRC:.c=.o)))
-OBJ_SERVER=$(addprefix obj/server/,$(notdir $(SRC:.c=.o)))
+OBJ_SERVER=$(addprefix obj/server/,$(filter-out oc_obt.o,$(notdir $(SRC:.c=.o))))
OBJ_CLIENT_SERVER=$(addprefix obj/client_server/,$(notdir $(SRC:.c=.o)))
VPATH=../../messaging/coap/:../../util/:../../api/:../../deps/tinycbor/src/:../../deps/mbedtls/library:
LIBS?= -lm -pthread -lrt
|
[tb] Set MaxSlvTrans back to 4 | @@ -89,7 +89,7 @@ module mempool_tb;
NoSlvPorts : NumAXIMasters,
NoMstPorts : NumAXISlaves,
MaxMstTrans : 4,
- MaxSlvTrans : 3,
+ MaxSlvTrans : 4,
FallThrough : 1'b0,
LatencyMode : axi_pkg::CUT_MST_PORTS,
AxiIdWidthSlvPorts: AxiMstIdWidth,
|
Initialize screen before starting the stream
As soon as the stream is started, the video buffer could notify a new
frame available.
In order to pass this event to the screen without race condition, the
screen must be initialized before the screen is started. | @@ -366,13 +366,6 @@ scrcpy(const struct scrcpy_options *options) {
stream_init(&stream, server.video_socket, dec, rec);
- // now we consumed the header values, the socket receives the video stream
- // start the stream
- if (!stream_start(&stream)) {
- goto end;
- }
- stream_started = true;
-
if (options->display) {
if (options->control) {
if (!controller_init(&controller, server.control_socket)) {
@@ -415,6 +408,13 @@ scrcpy(const struct scrcpy_options *options) {
}
}
+ // now we consumed the header values, the socket receives the video stream
+ // start the stream
+ if (!stream_start(&stream)) {
+ goto end;
+ }
+ stream_started = true;
+
input_manager_init(&input_manager, options);
ret = event_loop(options);
|
Updater: Hide nightly changelog text by default | @@ -86,7 +86,7 @@ VOID ShowAvailableDialog(
memset(&config, 0, sizeof(TASKDIALOGCONFIG));
config.cbSize = sizeof(TASKDIALOGCONFIG);
- config.dwFlags = TDF_USE_HICON_MAIN | TDF_ALLOW_DIALOG_CANCELLATION | TDF_CAN_BE_MINIMIZED | TDF_ENABLE_HYPERLINKS | TDF_EXPANDED_BY_DEFAULT;
+ config.dwFlags = TDF_USE_HICON_MAIN | TDF_ALLOW_DIALOG_CANCELLATION | TDF_CAN_BE_MINIMIZED | TDF_ENABLE_HYPERLINKS;
config.dwCommonButtons = TDCBF_CANCEL_BUTTON;
config.hMainIcon = Context->IconLargeHandle;
config.pszWindowTitle = L"Process Hacker - Updater";
|
Make HttpClient_WinInet.hpp align with project wide style around pragma once. | // Copyright (c) Microsoft. All rights reserved.
+#ifndef HTTPCLIENT_WININET_HPP
+#define HTTPCLIENT_WININET_HPP
-#pragma once
#include "IHttpClient.hpp"
#include "pal/PAL.hpp"
namespace ARIASDK_NS_BEGIN {
-
#ifndef _WININET_
typedef void* HINTERNET;
#endif
@@ -34,5 +34,6 @@ class HttpClient_WinInet : public IHttpClient {
friend class WinInetRequestWrapper;
};
-
} ARIASDK_NS_END
+
+#endif //HTTPCLIENT_WININET_HPP
|
libopae++: fix issue identified by checkers | @@ -85,28 +85,28 @@ const char *except::what() const noexcept {
errno_t err;
bool buf_ok = false;
if (msg_) {
- err = strncpy_s(buf_, MAX_EXCEPT, msg_, 64);
+ err = strncpy_s(buf_, MAX_EXCEPT-64, msg_, 64);
} else {
- err = strncpy_s(buf_, MAX_EXCEPT, "failed with error ", 64);
+ err = strncpy_s(buf_, MAX_EXCEPT-64, "failed with error ", 64);
if (err) goto log_err;
- err = strcat_s(buf_, MAX_EXCEPT, fpgaErrStr(res_));
+ err = strcat_s(buf_, MAX_EXCEPT-64, fpgaErrStr(res_));
}
if (err) goto log_err;
buf_ok = true;
- err = strcat_s(buf_, MAX_EXCEPT, " at: ");
+ err = strcat_s(buf_, MAX_EXCEPT-64, " at: ");
if (err) goto log_err;
- err = strcat_s(buf_, MAX_EXCEPT, loc_.file());
+ err = strcat_s(buf_, MAX_EXCEPT-64, loc_.file());
if (err) goto log_err;
- err = strcat_s(buf_, MAX_EXCEPT, ":");
+ err = strcat_s(buf_, MAX_EXCEPT-64, ":");
if (err) goto log_err;
- err = strcat_s(buf_, MAX_EXCEPT, loc_.fn());
+ err = strcat_s(buf_, MAX_EXCEPT-64, loc_.fn());
if (err) goto log_err;
- err = strcat_s(buf_, MAX_EXCEPT, "():");
+ err = strcat_s(buf_, MAX_EXCEPT-64, "():");
if (err) goto log_err;
snprintf_s_i(buf_ + strlen(buf_), 64, "%d", loc_.line());
|
remove stat in initEnv()
Using stat broke initEnv() in a container for some reason. | @@ -1360,7 +1360,7 @@ initEnv(int *attachedFlag)
// clear the flag by default
*attachedFlag = 0;
- if (!g_fn.stat || !g_fn.fopen || !g_fn.fgets || !g_fn.fclose || !g_fn.setenv) {
+ if (!g_fn.fopen || !g_fn.fgets || !g_fn.fclose || !g_fn.setenv) {
//scopeLog("ERROR: missing g_fn's for initEnv()", -1, CFG_LOG_ERROR);
return;
}
@@ -1373,18 +1373,6 @@ initEnv(int *attachedFlag)
return;
}
- // see if it's there
- struct stat statbuf;
- if (g_fn.stat(path, &statbuf) != 0) {
- //if (errno != ENOENT) {
- // scopeLog("ERROR: stat(scope_attach_PID.env) failed", -1, CFG_LOG_ERROR);
- //}
- return;
- }
-
- // the .env file is there so we're attached
- *attachedFlag = 1;
-
// open it
FILE *fd = g_fn.fopen(path, "r");
if (fd == NULL) {
@@ -1392,6 +1380,9 @@ initEnv(int *attachedFlag)
return;
}
+ // the .env file is there so we're attached
+ *attachedFlag = 1;
+
// read "KEY=VALUE\n" lines and add them to the environment
char line[8192];
while (g_fn.fgets(line, sizeof(line), fd)) {
|
fixup: correct image names | @@ -612,8 +612,8 @@ def deployHomepage() {
'docker-hub-elektra-jenkins') {
def backendName = "elektra-backend"
def frontendName = "elektra-frontend"
- def backend = docker.image(DOCKER_IMAGES.homepage_backend.id)
- def frontend = docker.image(DOCKER_IMAGES.homepage_frontend.id)
+ def backend = docker.image(DOCKER_IMAGES.homepage-backend.id)
+ def frontend = docker.image(DOCKER_IMAGES.homepage-frontend.id)
backend.pull()
frontend.pull()
@@ -644,8 +644,8 @@ def deployHomepage() {
def buildHomepage() {
def homepageTasks = [:]
- homepageTasks << buildImageStage(DOCKER_IMAGES.homepage_frontend)
- homepageTasks << buildImageStage(DOCKER_IMAGES.homepage_backend)
+ homepageTasks << buildImageStage(DOCKER_IMAGES.homepage-frontend)
+ homepageTasks << buildImageStage(DOCKER_IMAGES.homepage-backend)
return homepageTasks
}
|
Change name of variable reporting metric. | @@ -225,7 +225,7 @@ WSGI_STATIC_INTERNED_STRING(threads);
WSGI_STATIC_INTERNED_STRING(thread_id);
WSGI_STATIC_INTERNED_STRING(threads_maximum);
-WSGI_STATIC_INTERNED_STRING(threads_enabled);
+WSGI_STATIC_INTERNED_STRING(threads_initialized);
WSGI_STATIC_INTERNED_STRING(active_threads);
WSGI_STATIC_INTERNED_STRING(time_interval);
WSGI_STATIC_INTERNED_STRING(utilization);
@@ -278,7 +278,7 @@ static void wsgi_initialize_interned_strings(void)
WSGI_CREATE_INTERNED_STRING_ID(thread_id);
WSGI_CREATE_INTERNED_STRING_ID(threads_maximum);
- WSGI_CREATE_INTERNED_STRING_ID(threads_enabled);
+ WSGI_CREATE_INTERNED_STRING_ID(threads_initialized);
WSGI_CREATE_INTERNED_STRING_ID(active_threads);
WSGI_CREATE_INTERNED_STRING_ID(time_interval);
WSGI_CREATE_INTERNED_STRING_ID(utilization);
@@ -473,7 +473,7 @@ static PyObject *wsgi_request_metrics(void)
object = wsgi_PyInt_FromLong(wsgi_request_threads);
PyDict_SetItem(result,
- WSGI_INTERNED_STRING(threads_enabled), object);
+ WSGI_INTERNED_STRING(threads_initialized), object);
Py_DECREF(object);
object = wsgi_PyInt_FromLong(wsgi_active_requests);
|
Test attribute table hash collision handling | @@ -3458,6 +3458,33 @@ START_TEST(test_ns_duplicate_attrs_diff_prefixes)
}
END_TEST
+START_TEST(test_ns_duplicate_hashes)
+{
+ /* The hash of an attribute is calculated as the hash of its URI
+ * concatenated with a space followed by its name (after the
+ * colon). We wish to generate attributes with the same hash
+ * value modulo the attribute table size so that we can check that
+ * the attribute hash table works correctly. The attribute hash
+ * table size will be the smallest power of two greater than the
+ * number of attributes, but at least eight. There is
+ * unfortunately no programmatic way of getting the hash or the
+ * table size at user level, but the test code coverage percentage
+ * will drop if the hashes cease to point to the same row.
+ *
+ * The cunning plan is to have few enough attributes to have a
+ * reliable table size of 8, and have the single letter attribute
+ * names be 8 characters apart, producing a hash which will be the
+ * same modulo 8.
+ */
+ const char *text =
+ "<doc xmlns:a='http://example.org/a'\n"
+ " a:a='v' a:i='w' />";
+ if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),
+ XML_TRUE) == XML_STATUS_ERROR)
+ xml_failure(parser);
+}
+END_TEST
+
/* Regression test for SF bug #695401: unbound prefix. */
START_TEST(test_ns_unbound_prefix_on_attribute)
{
@@ -4813,6 +4840,7 @@ make_suite(void)
tcase_add_test(tc_namespace, test_ns_unbound_prefix);
tcase_add_test(tc_namespace, test_ns_default_with_empty_uri);
tcase_add_test(tc_namespace, test_ns_duplicate_attrs_diff_prefixes);
+ tcase_add_test(tc_namespace, test_ns_duplicate_hashes);
tcase_add_test(tc_namespace, test_ns_unbound_prefix_on_attribute);
tcase_add_test(tc_namespace, test_ns_unbound_prefix_on_element);
tcase_add_test(tc_namespace, test_ns_parser_reset);
|
Workflow: enable AES256 image encryption tests | @@ -15,11 +15,15 @@ jobs:
- "sig-ecdsa,sig-ecdsa-mbedtls,sig-ed25519,enc-kw,bootstrap"
- "sig-rsa,sig-rsa3072,overwrite-only,validate-primary-slot,swap-move"
- "enc-rsa"
+ - "enc-aes256-rsa"
- "enc-ec256"
+ - "enc-aes256-ec256"
- "enc-x25519"
+ - "enc-aes256-x25519"
- "sig-rsa overwrite-only large-write,sig-ecdsa overwrite-only large-write,sig-ecdsa-mbedtls overwrite-only large-write,multiimage overwrite-only large-write"
- "sig-rsa validate-primary-slot,sig-ecdsa validate-primary-slot,sig-ecdsa-mbedtls validate-primary-slot,sig-rsa multiimage validate-primary-slot"
- "enc-kw overwrite-only large-write,enc-rsa overwrite-only large-write"
+ - "enc-aes256-kw overwrite-only large-write,enc-rsa overwrite-only large-write"
- "sig-rsa enc-rsa validate-primary-slot,swap-move enc-rsa sig-rsa validate-primary-slot bootstrap"
- "sig-rsa enc-kw validate-primary-slot bootstrap,sig-ed25519 enc-x25519 validate-primary-slot"
- "sig-ecdsa enc-kw validate-primary-slot"
@@ -27,6 +31,7 @@ jobs:
- "sig-rsa validate-primary-slot overwrite-only large-write"
- "sig-ecdsa enc-ec256 validate-primary-slot"
- "sig-ecdsa-mbedtls enc-ec256-mbedtls validate-primary-slot"
+ - "sig-ecdsa-mbedtls enc-aes256-ec256 validate-primary-slot"
- "sig-rsa validate-primary-slot overwrite-only downgrade-prevention"
runs-on: ubuntu-latest
env:
|
mqtt: compile out debug loop when debug is disabled | @@ -1111,12 +1111,14 @@ tcp_input(struct tcp_socket *s,
conn->in_packet.payload_pos += copy_bytes;
pos += copy_bytes;
+#if DEBUG_MQTT == 1
uint32_t i;
DBG("MQTT - Copied bytes: \n");
for(i = 0; i < copy_bytes; i++) {
DBG("%02X ", conn->in_packet.payload[i]);
}
DBG("\n");
+#endif
/* Full buffer, shall only happen to PUBLISH messages. */
if(MQTT_INPUT_BUFF_SIZE - conn->in_packet.payload_pos == 0) {
|
include/mock/fp_sensor_mock.h: Format with clang-format
BRANCH=none
TEST=none | @@ -29,7 +29,8 @@ struct mock_ctrl_fp_sensor {
};
#define MOCK_CTRL_DEFAULT_FP_SENSOR \
-(struct mock_ctrl_fp_sensor) { \
+ (struct mock_ctrl_fp_sensor) \
+ { \
.fp_sensor_init_return = EC_SUCCESS, \
.fp_sensor_deinit_return = EC_SUCCESS, \
.fp_sensor_get_info_return = EC_SUCCESS, \
|
fsutils:ipcfg Fix range checking for PRTOCOL in bin mode | @@ -551,7 +551,7 @@ int ipcfg_write(FAR const char *netdev, FAR const struct ipcfg_s *ipcfg)
/* Format and write the file */
- if ((unsigned)ipcfg->proto == MAX_BOOTPROTO)
+ if ((unsigned)ipcfg->proto > MAX_BOOTPROTO)
{
fprintf(stderr, "ERROR: Unrecognized BOOTPROTO value: %d\n",
ipcfg->proto);
|
Remove unneeded comparison with true | @@ -52,7 +52,7 @@ export default async (buildRoot, customColorsEnabled, { CART_TYPE }) => {
objFiles.push(objFile);
}
- if (customColorsEnabled == true) {
+ if (customColorsEnabled) {
cmds.push(`${CC} ${CFLAGS} ${CGBFLAGS} -o build/rom/game.gb ${objFiles.join(" ")}`);
} else {
cmds.push(`${CC} ${CFLAGS} -o build/rom/game.gb ${objFiles.join(" ")}`);
|
Fixed syntax error in lv_bar.c when animations are disabled | @@ -345,9 +345,9 @@ static bool lv_bar_design(lv_obj_t * bar, const lv_area_t * mask, lv_design_mode
#endif
lv_bar_ext_t * ext = lv_obj_get_ext_attr(bar);
- if(ext->cur_value != ext->min_value || ext->sym ||
+ if(ext->cur_value != ext->min_value || ext->sym
#if LV_USE_ANIMATION
- ext->anim_start != LV_BAR_ANIM_STATE_INV
+ || ext->anim_start != LV_BAR_ANIM_STATE_INV
#endif
) {
const lv_style_t * style_indic = lv_bar_get_style(bar, LV_BAR_STYLE_INDIC);
|
remove 260649 and 260650 from main paramId | typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 255 ;
}
-#Sea ice surface temperature
-'260649' = {
- discipline = 10 ;
- parameterCategory = 2 ;
- parameterNumber = 8 ;
- typeOfFirstFixedSurface = 174 ;
- typeOfSecondFixedSurface = 255 ;
- }
-#Snow on ice total depth
-'260650' = {
- discipline = 0 ;
- parameterCategory = 1 ;
- parameterNumber = 11 ;
- typeOfFirstFixedSurface = 174 ;
- typeOfSecondFixedSurface = 255 ;
- }
#Universal thermal climate index
'261001' = {
discipline = 20 ;
|
fix:fix ethereum test case(test_001CreateWallet_0010CreateSixWallet) | @@ -272,6 +272,7 @@ END_TEST
START_TEST(test_001CreateWallet_0010CreateSixWallet)
{
BSINT32 rtnVal;
+ BoatIotSdkInit();
BoatEthWalletConfig wallet = get_ethereum_wallet_settings();
extern BoatIotSdkContext g_boat_iot_sdk_context;
wallet.prikeyCtx_config.prikey_genMode = BOAT_WALLET_PRIKEY_GENMODE_INTERNAL_GENERATION;
|
Implement generate resumption master secret | @@ -1507,9 +1507,42 @@ cleanup:
int mbedtls_ssl_tls13_generate_resumption_master_secret(
mbedtls_ssl_context *ssl )
{
+ int ret = 0;
+
+ mbedtls_md_type_t md_type;
+
+ unsigned char transcript[MBEDTLS_MD_MAX_SIZE];
+ size_t transcript_len;
+
+ MBEDTLS_SSL_DEBUG_MSG( 2,
+ ( "=> mbedtls_ssl_tls13_generate_resumption_master_secret" ) );
+
+ md_type = ssl->handshake->ciphersuite_info->mac;
+
+ ret = mbedtls_ssl_get_handshake_transcript( ssl, md_type,
+ transcript, sizeof( transcript ),
+ &transcript_len );
+ if( ret != 0 )
+ return( ret );
+
+ ret = mbedtls_ssl_tls13_derive_resumption_master_secret(
+ mbedtls_psa_translate_md( md_type ),
+ ssl->handshake->tls13_master_secrets.app,
+ transcript, transcript_len,
+ &ssl->session_negotiate->app_secrets );
+ if( ret != 0 )
+ return( ret );
+
/* Erase master secrets */
mbedtls_platform_zeroize( &ssl->handshake->tls13_master_secrets,
sizeof( ssl->handshake->tls13_master_secrets ) );
+
+ MBEDTLS_SSL_DEBUG_BUF( 4, "Resumption master secret",
+ ssl->session_negotiate->app_secrets.resumption_master_secret,
+ mbedtls_md_get_size( mbedtls_md_info_from_type( md_type ) ) );
+
+ MBEDTLS_SSL_DEBUG_MSG( 2,
+ ( "<= mbedtls_ssl_tls13_generate_resumption_master_secret" ) );
return( 0 );
}
|
Drop explicit TypeSynonymInstances pragma
This is implied by FlexibleInstances in newer GHC releases. | -{-# LANGUAGE FlexibleInstances, ForeignFunctionInterface, ScopedTypeVariables #-}
-
--- In older versions of GHC, FlexibleInstances doesn't imply
--- TypeSynonymInstances, so we need to enable it explicitly.
--- See #29.
-{-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE ForeignFunctionInterface #-}
+{-# LANGUAGE ScopedTypeVariables #-}
module Scripting.Lua
( LuaState
|
bugID:17646749:[cm] add setup retry | @@ -222,21 +222,25 @@ static int _mqtt_connect(uint32_t timeout)
HAL_GetDeviceName(device_name);
HAL_GetDeviceSecret(device_secret);
- /* Device AUTH */
- if (0 != IOT_SetupConnInfo(product_key, device_name, device_secret, (void **)&pconn_info)) {
- cm_err("IOT_SetupConnInfo failed");
- return -1;
- }
+ ARGUMENT_SANITY_CHECK(strlen(device_name), FAIL_RETURN);
+ ARGUMENT_SANITY_CHECK(strlen(product_key), FAIL_RETURN);
+ iotx_time_init(&timer);
+ utils_time_countdown_ms(&timer, timeout);
+ /* Device AUTH */
+ do {
+ if (0 == IOT_SetupConnInfo(product_key, device_name, device_secret, (void **)&pconn_info)) {
mqtt_param->port = pconn_info->port;
mqtt_param->host = pconn_info->host_name;
mqtt_param->client_id = pconn_info->client_id;
mqtt_param->username = pconn_info->username;
mqtt_param->password = pconn_info->password;
mqtt_param->pub_key = pconn_info->pub_key;
-
- iotx_time_init(&timer);
- utils_time_countdown_ms(&timer, timeout);
+ break;
+ }
+ cm_err("IOT_SetupConnInfo failed");
+ HAL_SleepMs(500);
+ } while (!utils_time_is_expired(&timer));
do {
pclient = IOT_MQTT_Construct((iotx_mqtt_param_t *)_mqtt_conncection->open_params);
@@ -251,6 +255,7 @@ static int _mqtt_connect(uint32_t timeout)
}
return 0;
}
+ HAL_SleepMs(500);
} while (!utils_time_is_expired(&timer));
iotx_cm_event_msg_t event;
|
remove java 10 only options from java 8 run args | @@ -15,6 +15,33 @@ def parse_args():
return parser.parse_args()
+# temporary, for jdk8/jdk9+ compatibility
+def fix_cmd(cmd):
+ if not cmd:
+ return cmd
+ java = cmd[0]
+ if not java.endswith('java') and not java.endswith('java.exe'):
+ return cmd
+ p = subprocess.Popen([java, '-version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ out, err = p.communicate()
+ out, err = out.strip(), err.strip()
+ if not ((out or '').strip().startswith('java version "10') or (err or '').strip().startswith('java version "10')):
+ res = []
+ i = 0
+ while i < len(cmd):
+ for option in ('--add-exports', '--add-modules'):
+ if cmd[i] == option:
+ i += 1
+ break
+ elif cmd[i].startswith(option + '='):
+ break
+ else:
+ res.append(cmd[i])
+ i += 1
+ return res
+ return cmd
+
+
def main():
opts, args = parse_args()
@@ -30,6 +57,7 @@ def main():
# fix java classpath
i = args.index('-classpath')
args[i + 1] = args[i + 1].replace(opts.tests_jar_path, dest)
+ args = fix_cmd(args[:i]) + args[i:]
# run java cmd
os.execv(args[0], args)
|
kubectl-gadget: Add NET_RAW capability
This is needed by gadgets that open raw sockets like dns and snisnoop | @@ -295,6 +295,9 @@ spec:
# Needed by BCC python-based gadgets to load the kheaders module:
# https://github.com/iovisor/bcc/blob/v0.24.0/src/cc/frontends/clang/kbuild_helper.cc#L158
- SYS_MODULE
+
+ # Needed by gadgets that open a raw sock like dns and snisnoop
+ - NET_RAW
volumeMounts:
- name: host
mountPath: /host
|
updated a missing rename | @@ -604,7 +604,7 @@ extern int s2n_config_set_monotonic_clock(struct s2n_config *config, s2n_clock_t
return 0;
}
-int s2n_config_set_cache_store_callback(struct s2n_config *config, cache_store cache_store_callback, void *data)
+int s2n_config_set_cache_store_callback(struct s2n_config *config, s2n_cache_store_callback cache_store_callback, void *data)
{
notnull_check(cache_store_callback);
@@ -614,7 +614,7 @@ int s2n_config_set_cache_store_callback(struct s2n_config *config, cache_store c
return 0;
}
-int s2n_config_set_cache_retrieve_callback(struct s2n_config *config, cache_retrieve cache_retrieve_callback, void *data)
+int s2n_config_set_cache_retrieve_callback(struct s2n_config *config, s2n_cache_retrieve_callback cache_retrieve_callback, void *data)
{
notnull_check(cache_retrieve_callback);
@@ -624,7 +624,7 @@ int s2n_config_set_cache_retrieve_callback(struct s2n_config *config, cache_retr
return 0;
}
-int s2n_config_set_cache_delete_callback(struct s2n_config *config, cache_delete cache_delete_callback, void *data)
+int s2n_config_set_cache_delete_callback(struct s2n_config *config, s2n_cache_delete_callback cache_delete_callback, void *data)
{
notnull_check(cache_delete_callback);
|
moli: modify config fields of barrel-jack power
TEST=make BOARD=moli | @@ -194,10 +194,10 @@ enum mft_channel {
* firmware config fields
*/
/*
- * Barrel-jack power (4 bits).
+ * Barrel-jack power (2 bits).
*/
#define EC_CFG_BJ_POWER_L 0
-#define EC_CFG_BJ_POWER_H 3
+#define EC_CFG_BJ_POWER_H 1
#define EC_CFG_BJ_POWER_MASK GENMASK(EC_CFG_BJ_POWER_H, EC_CFG_BJ_POWER_L)
extern void adp_connect_interrupt(enum gpio_signal signal);
|
Tweak cmd/wuffsfmt/main.go | @@ -97,12 +97,12 @@ func isWuffsFile(info os.FileInfo) bool {
}
func walk(filename string, info os.FileInfo, err error) error {
- if err == nil && isWuffsFile(info) {
+ if (err == nil) && isWuffsFile(info) {
err = do(nil, filename)
}
// Don't complain if a file was deleted in the meantime (i.e. the directory
- // changed concurrently while running wuffsfmt).
- if err != nil && !os.IsNotExist(err) {
+ // changed concurrently while running this program).
+ if (err != nil) && !os.IsNotExist(err) {
return err
}
return nil
@@ -158,17 +158,15 @@ func do(r io.Reader, filename string) error {
const chmodSupported = runtime.GOOS != "windows"
func writeFile(filename string, b []byte) error {
- info, err := os.Stat(filename)
- if err != nil {
- return err
- }
f, err := ioutil.TempFile(filepath.Dir(filename), filepath.Base(filename))
if err != nil {
return err
}
if chmodSupported {
+ if info, err := os.Stat(filename); err == nil {
f.Chmod(info.Mode().Perm())
}
+ }
_, werr := f.Write(b)
cerr := f.Close()
if werr != nil {
|
Fix create_deferred_action initialization | @@ -71,7 +71,7 @@ static struct st_deferred_request_action_t *create_deferred_action(h2o_req_t *re
{
struct st_deferred_request_action_t *action = h2o_mem_alloc_shared(&req->pool, sz, on_deferred_action_dispose);
action->req = req;
- action->timeout.cb = cb;
+ action->timeout = h2o_timeout_init(cb);
h2o_timeout_link(req->conn->ctx->loop, 0, &action->timeout);
return action;
}
|
find-doc-nits: Add -m option allowing to select on which of man1,man3,man5,man7 to focus on | @@ -35,6 +35,7 @@ our($opt_s);
our($opt_o);
our($opt_h);
our($opt_l);
+our($opt_m);
our($opt_n);
our($opt_p);
our($opt_u);
@@ -50,6 +51,7 @@ Find small errors (nits) in documentation. Options:
-e Detailed list of new undocumented (implies -v)
-h Print this help message
-l Print bogus links
+ -m Name(s) of manuals to focus on. Default: man1,man3,man5,man7
-n Print nits in POD pages
-o Causes -e/-v to count symbols added since 1.1.1 as new (implies -v)
-u Count undocumented functions
@@ -58,7 +60,7 @@ EOF
exit;
}
-getopts('cdehlnouv');
+getopts('cdehlm:nouv');
help() if $opt_h;
$opt_u = 1 if $opt_d;
@@ -78,7 +80,11 @@ my $temp = '/tmp/docnits.txt';
my $OUT;
my $status = 0;
-my @sections = ( 'man1', 'man3', 'man5', 'man7' );
+$opt_m = "man1,man3,man5,man7" unless $opt_m;
+die "Argument of -m option may contain only man1, man3, man5, and/or man7"
+ unless $opt_m =~ /^(man[1357][, ]?)*$/;
+my @sections = ( split /[, ]/, $opt_m );
+
my %mandatory_sections = (
'*' => [ 'NAME', 'DESCRIPTION', 'COPYRIGHT' ],
1 => [ 'SYNOPSIS', 'OPTIONS' ],
@@ -148,7 +154,7 @@ my %collected_results = ();
# - exclusive selectors, only applicable together with
# any of the manual selectors. If any of these are
# present, only the manuals from the given sections
-# will be include. If none of these are present,
+# will be included. If none of these are present,
# the manuals from all sections will be returned.
#
# All returned manual files come from configdata.pm.
@@ -712,7 +718,7 @@ sub check {
files(TAGS => [ 'manual', 'man1' ]) );
# TODO: Filter out "foreign manual" links.
next if $target =~ /ps|apropos|sha1sum|procmail|perl/;
- err($id, "Bad command link L<$target(1)>");
+ err($id, "Bad command link L<$target(1)>") if grep /man1/, @sections;
}
# Check for proper in-man-3 API links.
while ( $contents =~ /L<([^>]*)\(3\)(?:\/.*)?>/g ) {
@@ -1180,7 +1186,7 @@ if ( $opt_l ) {
if ( $opt_n ) {
# If not given args, check that all man1 commands are named properly.
- if ( scalar @ARGV == 0 ) {
+ if ( scalar @ARGV == 0 && grep /man1/, @sections ) {
foreach ( files(TAGS => [ 'public_manual', 'man1' ]) ) {
next if /openssl\.pod/
|| /CA\.pl/ || /tsget\.pod/; # these commands are special cases
|
rpl-udp example: remove uipbuf tuning of MAC max retries | @@ -33,10 +33,7 @@ udp_rx_callback(struct simple_udp_connection *c,
uint16_t datalen)
{
unsigned count = *(unsigned *)data;
- /* If tagging of traffic class is enabled tc will print number of
- transmission - otherwise it will be 0 */
- LOG_INFO("Received response %u (tc:%d) from ", count,
- uipbuf_get_attr(UIPBUF_ATTR_MAX_MAC_TRANSMISSIONS));
+ LOG_INFO("Received response %u from ", count);
LOG_INFO_6ADDR(sender_addr);
LOG_INFO_("\n");
}
@@ -62,12 +59,6 @@ PROCESS_THREAD(udp_client_process, ev, data)
LOG_INFO("Sending request %u to ", count);
LOG_INFO_6ADDR(&dest_ipaddr);
LOG_INFO_("\n");
- /* Set the number of transmissions to use for this packet -
- this can be used to create more reliable transmissions or
- less reliable than the default. Works end-to-end if
- UIP_CONF_TAG_TC_WITH_VARIABLE_RETRANSMISSIONS is set to 1.
- */
- uipbuf_set_attr(UIPBUF_ATTR_MAX_MAC_TRANSMISSIONS, 1 + count % 5);
simple_udp_sendto(&udp_conn, &count, sizeof(count), &dest_ipaddr);
count++;
} else {
|
Save signum and faulting address in static variables
Comes in handy when looking at core files from optimized images. | @@ -88,12 +88,18 @@ unsetup_signal_handlers (int sig)
dangerous to vec_resize it when crashing, mheap itself might have been
corruptted already */
static u8 *syslog_msg = 0;
+static int last_signum = 0;
+static uword last_faulting_address = 0;
static void
unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
{
uword fatal = 0;
+ /* These come in handy when looking at core files from optimized images */
+ last_signum = signum;
+ last_faulting_address = (uword) si->si_addr;
+
syslog_msg = format (syslog_msg, "received signal %U, PC %U",
format_signal, signum, format_ucontext_pc, uc);
|
Remove duplicated packet type check | @@ -4155,13 +4155,6 @@ static ssize_t conn_recv_pkt(ngtcp2_conn *conn, const uint8_t *pkt,
return (ssize_t)pktlen;
}
- if (hd.type == NGTCP2_PKT_VERSION_NEGOTIATION) {
- ngtcp2_log_rx_pkt_hd(&conn->log, &hd);
-
- /* Ignore late VN. */
- return (ssize_t)pktlen;
- }
-
switch (hd.type) {
case NGTCP2_PKT_INITIAL:
case NGTCP2_PKT_HANDSHAKE:
|
testcase/filesystem: Fix expect value of dprintf negative case function
Fix the expect value of the "tc_libc_stdio_dprintf_invalid_fd_n()" function. | @@ -3043,7 +3043,7 @@ static void tc_libc_stdio_dprintf_invalid_fd_n(void)
/* Testcase */
ret = dprintf(CONFIG_NFILE_DESCRIPTORS, "%s", str);
- TC_ASSERT_EQ("dprintf", ret, 0);
+ TC_ASSERT_EQ("dprintf", ret, ERROR);
TC_SUCCESS_RESULT();
}
|
replacing import_item statment in test | import numpy as np
import pytest
-from IPython.utils.importstring import import_item
+#from IPython.utils.importstring import import_item
+from traitlets import import_item
import pyccl as ccl
|
esp32/modules/inisetup.py: Mount filesystem at /flash like ESP8266 | @@ -28,8 +28,10 @@ def setup():
check_bootsec()
print("Performing initial setup")
uos.VfsFat.mkfs(bdev)
- vfs = uos.VfsFat(bdev, "")
- with open("/boot.py", "w") as f:
+ vfs = uos.VfsFat(bdev)
+ uos.mount(vfs, '/flash')
+ uos.chdir('/flash')
+ with open("boot.py", "w") as f:
f.write("""\
# This file is executed on every boot (including wake-boot from deepsleep)
""")
|
Correctly reset pstat->om on dos RESET
Tested-by: IoTivity Jenkins | @@ -132,7 +132,7 @@ oc_pstat_handle_state(oc_sec_pstat_t *ps, size_t device)
ps->isop = false;
ps->cm = 1;
ps->tm = 2;
- pstat->om = 3;
+ ps->om = 3;
ps->sm = 4;
memset(ps->rowneruuid.id, 0, 16);
oc_core_regen_unique_ids(device);
|
Consolidate short_help for classify table with memory-size
When creating 32K classify sessions, VPP crashes.
Default heap size is 2MB.
Need to configure it when requiring large number sessions. | @@ -1546,6 +1546,7 @@ VLIB_CLI_COMMAND (classify_table, static) = {
"classify table [miss-next|l2-miss_next|acl-miss-next <next_index>]"
"\n mask <mask-value> buckets <nn> [skip <n>] [match <n>]"
"\n [current-data-flag <n>] [current-data-offset <n>] [table <n>]"
+ "\n [memory-size <nn>[M][G]] [next-table <n>]"
"\n [del] [del-chain]",
.function = classify_table_command_fn,
};
|
yin parser ADD order check | @@ -259,6 +259,7 @@ parse_mod(struct lyxml_context *xml_ctx, const char **data, struct lysp_module *
enum yang_keyword kw = YANG_NONE;
const char *prefix, *name;
size_t prefix_len, name_len;
+ enum yang_module_stmt mod_stmt = Y_MOD_MODULE_HEADER;
char *buf = NULL, *out = NULL;
size_t buf_len = 0, out_len = 0;
@@ -289,6 +290,64 @@ parse_mod(struct lyxml_context *xml_ctx, const char **data, struct lysp_module *
}
while (xml_ctx->status == LYXML_ELEMENT || xml_ctx->status == LYXML_ELEM_CONTENT) {
+
+/* TODO ADD error log to macro */
+#define CHECK_ORDER(SECTION) \
+ if (mod_stmt > SECTION) {return LY_EVALID;}mod_stmt = SECTION
+
+ switch (kw) {
+ /* module header */
+ case YANG_NAMESPACE:
+ case YANG_PREFIX:
+ CHECK_ORDER(Y_MOD_MODULE_HEADER);
+ break;
+ case YANG_YANG_VERSION:
+ CHECK_ORDER(Y_MOD_MODULE_HEADER);
+ break;
+ /* linkage */
+ case YANG_INCLUDE:
+ case YANG_IMPORT:
+ CHECK_ORDER(Y_MOD_LINKAGE);
+ break;
+ /* meta */
+ case YANG_ORGANIZATION:
+ case YANG_CONTACT:
+ case YANG_DESCRIPTION:
+ case YANG_REFERENCE:
+ CHECK_ORDER(Y_MOD_META);
+ break;
+
+ /* revision */
+ case YANG_REVISION:
+ CHECK_ORDER(Y_MOD_REVISION);
+ break;
+ /* body */
+ case YANG_ANYDATA:
+ case YANG_ANYXML:
+ case YANG_AUGMENT:
+ case YANG_CHOICE:
+ case YANG_CONTAINER:
+ case YANG_DEVIATION:
+ case YANG_EXTENSION:
+ case YANG_FEATURE:
+ case YANG_GROUPING:
+ case YANG_IDENTITY:
+ case YANG_LEAF:
+ case YANG_LEAF_LIST:
+ case YANG_LIST:
+ case YANG_NOTIFICATION:
+ case YANG_RPC:
+ case YANG_TYPEDEF:
+ case YANG_USES:
+ case YANG_CUSTOM:
+ mod_stmt = Y_MOD_BODY;
+ break;
+ default:
+ /* error will be handled in the next switch */
+ break;
+ }
+#undef CHECK_ORDER
+
ret = lyxml_get_element(xml_ctx, data, &prefix, &prefix_len, &name, &name_len);
LY_CHECK_ERR_RET(ret != LY_SUCCESS, LOGMEM(xml_ctx->ctx), LY_EMEM);
kw = match_keyword(name, name_len);
|
add space boundary for grep | @@ -33,8 +33,7 @@ fi
echo
echo ++++ list of OpenHPC package groups
-#groups=`grep -o 'ohpc/[^ ]*' pkg-ohpc.all | sort -u | cut -c5-`
-groups=`grep -o 'ohpc/[^ ]*' pkg-ohpc.all | sort -u | cut -d '/' -f 2`
+groups=`grep -o '\sohpc/[^ ]*' pkg-ohpc.all | sort -u | cut -d '/' -f 2`
echo $groups
echo
|
include/rwsig.h: Format with clang-format
BRANCH=none
TEST=none | @@ -77,22 +77,21 @@ void rwsig_jump_now(void);
#endif /* ! CONFIG_RO_PUBKEY_SIZE */
#ifndef CONFIG_RO_PUBKEY_ADDR
#ifdef CONFIG_RWSIG_TYPE_RWSIG
-#define CONFIG_RO_PUBKEY_STORAGE_OFF (CONFIG_RO_STORAGE_OFF \
- + CONFIG_RO_SIZE \
- - CONFIG_RO_PUBKEY_SIZE)
+#define CONFIG_RO_PUBKEY_STORAGE_OFF \
+ (CONFIG_RO_STORAGE_OFF + CONFIG_RO_SIZE - CONFIG_RO_PUBKEY_SIZE)
/* The pubkey resides at the end of the RO image */
-#define CONFIG_RO_PUBKEY_ADDR (CONFIG_PROGRAM_MEMORY_BASE \
- + CONFIG_EC_PROTECTED_STORAGE_OFF \
- + CONFIG_RO_PUBKEY_STORAGE_OFF)
+#define CONFIG_RO_PUBKEY_ADDR \
+ (CONFIG_PROGRAM_MEMORY_BASE + CONFIG_EC_PROTECTED_STORAGE_OFF + \
+ CONFIG_RO_PUBKEY_STORAGE_OFF)
#else
/*
* usbpd1 type assumes pubkey location at the end of first half of flash,
* which might actually be in the PSTATE region.
*/
-#define CONFIG_RO_PUBKEY_ADDR (CONFIG_PROGRAM_MEMORY_BASE \
- + (CONFIG_FLASH_SIZE_BYTES / 2) \
- - CONFIG_RO_PUBKEY_SIZE)
+#define CONFIG_RO_PUBKEY_ADDR \
+ (CONFIG_PROGRAM_MEMORY_BASE + (CONFIG_FLASH_SIZE_BYTES / 2) - \
+ CONFIG_RO_PUBKEY_SIZE)
#endif
#endif /* CONFIG_RO_PUBKEY_ADDR */
@@ -109,12 +108,12 @@ void rwsig_jump_now(void);
#endif /* ! CONFIG_RW_SIG_SIZE */
/* The signature resides at the end of each RW copy */
#define RW_SIG_OFFSET (CONFIG_RW_SIZE - CONFIG_RW_SIG_SIZE)
-#define RW_A_ADDR (CONFIG_PROGRAM_MEMORY_BASE + \
- CONFIG_EC_WRITABLE_STORAGE_OFF + \
+#define RW_A_ADDR \
+ (CONFIG_PROGRAM_MEMORY_BASE + CONFIG_EC_WRITABLE_STORAGE_OFF + \
CONFIG_RW_STORAGE_OFF)
/* Assume the layout is same as RW_A and it sits right after RW_A */
-#define RW_B_ADDR (CONFIG_PROGRAM_MEMORY_BASE + \
- CONFIG_EC_WRITABLE_STORAGE_OFF + \
+#define RW_B_ADDR \
+ (CONFIG_PROGRAM_MEMORY_BASE + CONFIG_EC_WRITABLE_STORAGE_OFF + \
CONFIG_RW_B_STORAGE_OFF)
#ifndef CONFIG_RW_SIG_ADDR
#define CONFIG_RW_SIG_ADDR (RW_A_ADDR + RW_SIG_OFFSET)
|
Add Multipart Message authentication Compute & Verify cases | @@ -1155,6 +1155,25 @@ void mac_key_policy( int policy_usage_arg,
mac, PSA_MAC_MAX_SIZE, &mac_len ),
expected_status_sign );
+ /* Calculate the MAC, multi-part case. */
+ PSA_ASSERT( psa_mac_abort( &operation ) );
+ status = psa_mac_sign_setup( &operation, key, exercise_alg );
+ if( status == PSA_SUCCESS )
+ {
+ status = psa_mac_update( &operation, input, 128 );
+ if( status == PSA_SUCCESS )
+ TEST_EQUAL( psa_mac_sign_finish( &operation, mac, PSA_MAC_MAX_SIZE,
+ &mac_len ),
+ expected_status_sign );
+ else
+ TEST_EQUAL( status, expected_status_sign );
+ }
+ else
+ {
+ TEST_EQUAL( status, expected_status_sign );
+ }
+ PSA_ASSERT( psa_mac_abort( &operation ) );
+
/* Verify correct MAC, one-shot case. */
status = psa_mac_verify( key, exercise_alg, input, 128,
mac, mac_len );
@@ -1164,6 +1183,29 @@ void mac_key_policy( int policy_usage_arg,
else
TEST_EQUAL( status, expected_status_verify );
+ /* Verify correct MAC, multi-part case. */
+ status = psa_mac_verify_setup( &operation, key, exercise_alg );
+ if( status == PSA_SUCCESS )
+ {
+ status = psa_mac_update( &operation, input, 128 );
+ if( status == PSA_SUCCESS )
+ {
+ status = psa_mac_verify_finish( &operation, mac, mac_len );
+ if( expected_status_sign != PSA_SUCCESS && expected_status_verify == PSA_SUCCESS )
+ TEST_EQUAL( status, PSA_ERROR_INVALID_SIGNATURE );
+ else
+ TEST_EQUAL( status, expected_status_verify );
+ }
+ else
+ {
+ TEST_EQUAL( status, expected_status_verify );
+ }
+ }
+ else
+ {
+ TEST_EQUAL( status, expected_status_verify );
+ }
+
psa_mac_abort( &operation );
memset( mac, 0, sizeof( mac ) );
|
Use 'set' instead of = or setting JsPrime Arrays | @@ -169,9 +169,9 @@ inline int val_array_size(value inArray)
}
//DEFFUNC_2(void,val_array_set_size,value,int)
-inline void val_array_set_i(value array,int index,value data) { array[index] = data; }
+inline void val_array_set_i(value array,int index,value data) { array.set(index,data); }
-inline void val_array_push(value array, value data) { array[ 1+array["length"].as<int>() ] = data; }
+inline void val_array_push(value array, value data) { array.set( 1+array["length"].as<int>(),data); }
inline value alloc_string_len(const char *inStr,int inLen) { return value(std::string(inStr,inStr+inLen)); }
|
remove mpiP from list of known items for aarch64 tech preview | @@ -30,8 +30,8 @@ in GSL are tuned for x86 which does 80-bit extended precision.
underlying ARM platform.
\item MPI: The hardware used for validating this Tech Preview release contained
only ethernet. The available MPI stacks reflect this test environment.
-\item mpiP: appears to have trouble collecting certain information in certain
-scenarios causing it to fail integration tests
+%\item mpiP: appears to have trouble collecting certain information in certain
+%scenarios causing it to fail integration tests
\item Hypre and SuperLU-dist: the libraries build, but when linking test
applications unresolved symbols remain
\item Nagios and Ganglia: don't work on SLES-12-SP1 due to missing PHP5
|
The function X509_gmtime_adj() can fail
Check for a failure and free a_tm as appropriate.
Found by Coverity | @@ -1095,13 +1095,13 @@ end_of_options:
goto end;
tmptm = ASN1_TIME_new();
- if (tmptm == NULL)
- goto end;
- X509_gmtime_adj(tmptm, 0);
- X509_CRL_set1_lastUpdate(crl, tmptm);
- if (!X509_time_adj_ex(tmptm, crldays, crlhours * 60 * 60 + crlsec,
- NULL)) {
+ if (tmptm == NULL
+ || X509_gmtime_adj(tmptm, 0) == NULL
+ || !X509_CRL_set1_lastUpdate(crl, tmptm)
+ || X509_time_adj_ex(tmptm, crldays, crlhours * 60 * 60 + crlsec,
+ NULL) == NULL) {
BIO_puts(bio_err, "error setting CRL nextUpdate\n");
+ ASN1_TIME_free(tmptm);
goto end;
}
X509_CRL_set1_nextUpdate(crl, tmptm);
@@ -2209,7 +2209,10 @@ static int do_updatedb(CA_DB *db)
return -1;
/* get actual time and make a string */
- a_tm = X509_gmtime_adj(a_tm, 0);
+ if (X509_gmtime_adj(a_tm, 0) == NULL) {
+ ASN1_UTCTIME_free(a_tm);
+ return -1;
+ }
a_tm_s = app_malloc(a_tm->length + 1, "time string");
memcpy(a_tm_s, a_tm->data, a_tm->length);
|
Add MultiRoCCGemmini config fragment | @@ -18,6 +18,7 @@ import testchipip._
import tracegen.{TraceGenSystem}
import hwacha.{Hwacha}
+import gemmini.{Gemmini, GemminiConfigs}
import boom.common.{BoomTileAttachParams}
import ariane.{ArianeTileAttachParams}
@@ -105,6 +106,16 @@ class WithMultiRoCCHwacha(harts: Int*) extends Config(
})
)
+class WithMultiRoCCGemmini(harts: Int*) extends Config((site, here, up) => {
+ case MultiRoCCKey => up(MultiRoCCKey, site) ++ harts.distinct.map { i =>
+ (i -> Seq((p: Parameters) => {
+ implicit val q = p
+ val gemmini = LazyModule(new Gemmini(OpcodeSet.custom3, GemminiConfigs.defaultConfig))
+ gemmini
+ }))
+ }
+})
+
class WithTraceIO extends Config((site, here, up) => {
case TilesLocated(InSubsystem) => up(TilesLocated(InSubsystem), site) map {
case tp: BoomTileAttachParams => tp.copy(tileParams = tp.tileParams.copy(
|
publish: resequence spinner for new.js | @@ -93,10 +93,11 @@ export class NewScreen extends Component {
group: groupInfo
}
}
-
- this.setState({awaiting: bookId, disabled: true}, () => {
props.api.setSpinner(true);
- props.api.action("publish", "publish-action", action);
+ this.setState({awaiting: bookId, disabled: true}, () => {
+ props.api.action("publish", "publish-action", action).then(() => {
+ props.api.setSpinner(false);
+ });
});
}
|
Log mipmaps error only if mipmaps are enabled | @@ -301,7 +301,7 @@ screen_init_rendering(struct screen *screen, const char *window_title,
} else {
LOGI("Trilinear filtering disabled");
}
- } else {
+ } else if (mipmaps) {
LOGD("Trilinear filtering disabled (not an OpenGL renderer)");
}
|
SOVERSION bump to version 5.6.13 | @@ -54,7 +54,7 @@ set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_
# with backward compatible change and micro version is connected with any internal change of the library.
set(SYSREPO_MAJOR_SOVERSION 5)
set(SYSREPO_MINOR_SOVERSION 6)
-set(SYSREPO_MICRO_SOVERSION 12)
+set(SYSREPO_MICRO_SOVERSION 13)
set(SYSREPO_SOVERSION_FULL ${SYSREPO_MAJOR_SOVERSION}.${SYSREPO_MINOR_SOVERSION}.${SYSREPO_MICRO_SOVERSION})
set(SYSREPO_SOVERSION ${SYSREPO_MAJOR_SOVERSION})
|
fpsensor: compilation error if RNG is not supported
FP operations require a working RNG, error if the corresponding config
hasn't been set.
TEST=make with CONFIG_RNG unset, observe failure to build
BRANCH=None | #include "watchdog.h"
#if !defined(CONFIG_AES) || !defined(CONFIG_AES_GCM) || \
- !defined(CONFIG_ROLLBACK_SECRET_SIZE)
-#error "fpsensor requires AES, AES_GCM and ROLLBACK_SECRET_SIZE"
+ !defined(CONFIG_ROLLBACK_SECRET_SIZE) || !defined(CONFIG_RNG)
+#error "fpsensor requires AES, AES_GCM, ROLLBACK_SECRET_SIZE and RNG"
#endif
#if defined(HAVE_PRIVATE) && !defined(TEST_BUILD)
|
ur: fixes a bug in ur_bsw_bytes()
which was introduced by an earlier fix for a buffer over-read | @@ -1037,12 +1037,23 @@ _bsw_bytes_unsafe(ur_bsw_t *bsw, uint64_t len, uint8_t *byt)
m = byt[i] >> rest;
}
- if ( len_bit ) {
- if ( len_bit < rest ) {
+ // no trailing bits; we need only write the rest of the last byte.
+ //
+ // NB: while semantically equivalent to the subsequent block,
+ // this case must be separate to avoid reading off the end of [byt]
+ //
+ if ( !len_bit ) {
+ bsw->bytes[fill] = m;
+ }
+ // trailing bits fit into the current output byte.
+ //
+ else if ( len_bit < rest ) {
l = byt[len_byt] & ((1 << len_bit) - 1);
bsw->bytes[fill] = m ^ (l << off);
off += len_bit;
}
+ // trailing bits extend into the next output byte.
+ //
else {
l = byt[len_byt] & mask;
bsw->bytes[fill++] = m ^ (l << off);
@@ -1053,7 +1064,6 @@ _bsw_bytes_unsafe(ur_bsw_t *bsw, uint64_t len, uint8_t *byt)
bsw->bytes[fill] = m & ((1 << off) - 1);
}
}
- }
bsw->off = off;
bsw->fill = fill;
|
regex: only set last byte when the group have a match | @@ -48,8 +48,11 @@ cb_onig_named(const UChar *name, const UChar *name_end,
region->end[gn] - region->beg[gn],
s->data);
}
+
+ if (region->end[gn] >= 0) {
s->last_pos = region->end[gn];
}
+ }
return 0;
}
@@ -151,7 +154,6 @@ int flb_regex_parse(struct flb_regex *r, struct flb_regex_search *result,
if (ret == 0) {
return result->last_pos;
}
-
return -1;
}
|
Addressing merge issues for the PR | @@ -259,6 +259,12 @@ func (s *PolicySets) protoRuleToHnsRules(policyId string, pRule *proto.Rule, isI
return nil, SkipRule
}
+ // Skip rules with name port ipsets
+ if len(pRule.SrcNamedPortIpSetIds) > 0 || len(pRule.DstNamedPortIpSetIds) > 0 {
+ log.WithField("rule", pRule).Info("Skipping rule because it contains named port ipsets (currently unsupported).")
+ return nil, SkipRule
+ }
+
// Filter the Src and Dst CIDRs to only the IP version that we're rendering
var filteredAll bool
ruleCopy := *pRule
|
Fix default wanted-by target to printer.target
There is no printers.target in systemd, only printer.target (see man bootup).
This regression was introduced in | @@ -10,7 +10,7 @@ dnl information.
dnl
dnl Set a default systemd WantedBy directive
-SYSTEMD_WANTED_BY="printers.target"
+SYSTEMD_WANTED_BY="printer.target"
dnl Default languages...
LANGUAGES="$(ls -1 locale/cups_*.po 2>/dev/null | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' ')"
|
tools/build_llsp: keep original boot vector
This creates a backup of the boot vector that we override, so we can boot the original firmware from within Pybricks. | @@ -56,20 +56,23 @@ from umachine import reset
SLOT = {slot}
PYBRICKS_SIZE = {size}
+EXTRA_SIZE = 8
BLOCK_WRITE = {block_write}
PYBRICKS_VECTOR = {pybricks_vector}
BLOCK_READ = 32
reads_per_write = BLOCK_WRITE // BLOCK_READ
-# Read boot data from the currently running firmware. This tells us which
-# sections to back up.
+# Read boot data from the currently running firmware.
OFFSET = 0x8008000
+start_data = flash_read(0x000)
boot_data = flash_read(0x200)
+
firmware_version_address = int.from_bytes(boot_data[0:4], 'little') - OFFSET
firmware_version = flash_read(firmware_version_address)[0:20]
checksum_address = int.from_bytes(boot_data[4:8], 'little') - OFFSET
checksum_value = int.from_bytes(flash_read(checksum_address)[0:4], 'little')
firmware_end_address = checksum_address + 4
+firmware_boot_vector = start_data[4:8]
# Original firmware starts directly after bootloader. This is where flash_read
# has index 0.
@@ -78,7 +81,7 @@ next_read_index = 0
# Store Pybricks starting on final section of 256K free space
pybricks_start = 0x80C0000 - OFFSET
pybricks_end = pybricks_start + PYBRICKS_SIZE
-total_end = pybricks_end + 4
+total_end = pybricks_end + EXTRA_SIZE
print('Creating empty space for backup')
@@ -184,6 +187,9 @@ while True:
print(progress)
progress_print = progress
+# Save the original LEGO boot vector so Pybricks can boot it
+appl_image_store(firmware_boot_vector)
+
overall_checksum = info()['new_appl_image_calc_checksum']
appl_image_store(overall_checksum.to_bytes(4, 'little'))
result = info()
|
install example config with meson | @@ -113,3 +113,9 @@ install_data(
install_mode: 'rwxr-xr-x',
rename : ['mangohud']
)
+
+install_data(
+ files('../bin/MangoHud.conf'),
+ install_dir : join_paths(get_option('datadir'), 'doc', 'mangohud'),
+ rename : ['MangoHud.conf.example']
+)
\ No newline at end of file
|
Don't reenable hide_sprites_under_win until menu has fully closed | @@ -122,6 +122,11 @@ void UIUpdate_b() {
}
} else {
UIDrawTextBuffer();
+ // Reenable hide_sprites_under_win if
+ // disabled, once UI has closed
+ if (!hide_sprites_under_win && UIIsClosed()) {
+ hide_sprites_under_win = TRUE;
+ }
}
WX_REG = win_pos_x + 7;
@@ -345,7 +350,6 @@ void UICloseDialogue_b() {
menu_enabled = FALSE;
menu_layout = 0;
avatar_enabled = FALSE;
- hide_sprites_under_win = TRUE;
}
void UIOnInteract_b() {
|
Only set iodine as default handler if ENV['RACK_HANDLER'] is not set
Rack appears to use this env var before selecting from a final list as per these docs | @@ -18,14 +18,7 @@ module Iodine
end
end
-ENV['RACK_HANDLER'] = 'iodine'
-
-# make Iodine the default fallback position for Rack.
-begin
- require 'rack/handler' unless defined?(Rack::Handler)
- Rack::Handler::WEBrick = ::Iodine::Rack # Rack::Handler.get(:iodine)
-rescue LoadError
-end
+ENV['RACK_HANDLER'] ||= 'iodine'
begin
::Rack::Handler.register('iodine', 'Iodine::Rack') if defined?(::Rack::Handler)
|
Use memcpy instead of strncpy in sized_string_dup.
With this change sized_string_dup works correctly even if the SIZED_STRING contains zeroes. | @@ -100,7 +100,7 @@ SIZED_STRING* sized_string_dup(
result->length = s->length;
result->flags = s->flags;
- strncpy(result->c_string, s->c_string, s->length + 1);
+ memcpy(result->c_string, s->c_string, s->length + 1);
return result;
}
|
ExtendedTools: Improve GPU segment enumeration | @@ -525,12 +525,8 @@ PETP_GPU_ADAPTER EtpAddDisplayAdapter(
)
{
PETP_GPU_ADAPTER adapter;
- SIZE_T sizeNeeded;
-
- sizeNeeded = FIELD_OFFSET(ETP_GPU_ADAPTER, ApertureBitMapBuffer);
- sizeNeeded += BYTES_NEEDED_FOR_BITS(NumberOfSegments);
- adapter = PhAllocateZero(sizeNeeded);
+ adapter = EtpAllocateGpuAdapter(NumberOfSegments);
adapter->DeviceInterface = PhCreateString(DeviceInterface);
adapter->AdapterLuid = AdapterLuid;
adapter->NodeCount = NumberOfNodes;
@@ -842,13 +838,20 @@ VOID EtpUpdateSystemSegmentInformation(
if (NT_SUCCESS(D3DKMTQueryStatistics(&queryStatistics)))
{
ULONG64 bytesCommitted;
+ ULONG aperture;
if (WindowsVersion >= WINDOWS_8)
+ {
bytesCommitted = queryStatistics.QueryResult.SegmentInformation.BytesResident;
+ aperture = queryStatistics.QueryResult.SegmentInformation.Aperture;
+ }
else
+ {
bytesCommitted = queryStatistics.QueryResult.SegmentInformationV1.BytesResident;
+ aperture = queryStatistics.QueryResult.SegmentInformationV1.Aperture;
+ }
- if (RtlCheckBit(&gpuAdapter->ApertureBitMap, j))
+ if (aperture)
sharedUsage += bytesCommitted;
else
dedicatedUsage += bytesCommitted;
|
Don't use storyboards on widget | </dict>
<key>NSExtension</key>
<dict>
- <key>NSExtensionPrincipalClass</key>
- <string>Pyto_Widget.ConsoleViewController</string>
<key>NSExtensionPointIdentifier</key>
<string>com.apple.widget-extension</string>
+ <key>NSExtensionPrincipalClass</key>
+ <string>Pyto_Widget.ConsoleViewController</string>
</dict>
</dict>
</plist>
|
make: use pkg-config to find openssl, remove homebrew hardcoded path | @@ -27,29 +27,35 @@ ifeq ($(HOSTOS), Linux)
INSTFLAGS += -D
endif
-ifeq ($(HOSTOS), Darwin)
-CFLAGS += -L/usr/local/opt/openssl/lib -I/usr/local/opt/openssl/include
-endif
+OPENSSL_LIBS=$(shell pkg-config --libs openssl)
+OPENSSL_CFLAGS=$(shell pkg-config --cflags openssl)
TOOLS=
TOOLS+=hcxpcapngtool
-hcxpcapngtool_libs=-lz -lcrypto -lssl
+hcxpcapngtool_libs=-lz $(OPENSSL_LIBS)
+hcxpcapngtool_cflags=$(OPENSSL_CFLAGS)
TOOLS+=hcxhashtool
-hcxhashtool_libs=-lcrypto -lssl -lcurl
+hcxhashtool_libs=-lcurl $(OPENSSL_LIBS)
+hcxhashtool_cflags=$(OPENSSL_CFLAGS)
TOOLS+=hcxpsktool
-hcxpsktool_libs=-lcrypto -lssl
+hcxpsktool_libs=$(OPENSSL_LIBS)
+hcxpsktool_cflags=$(OPENSSL_CFLAGS)
TOOLS+=hcxeiutool
TOOLS+=hcxwltool
TOOLS+=hcxhash2cap
TOOLS+=wlancap2wpasec
-wlancap2wpasec_libs=-lcrypto -lssl -lcurl
+wlancap2wpasec_libs=-lcurl $(OPENSSL_LIBS)
+wlancap2wpasec_cflags=$(OPENSSL_CFLAGS)
TOOLS+=whoismac
-whoismac_libs=-lcrypto -lssl -lcurl
+whoismac_libs=-lcurl $(OPENSSL_LIBS)
+whoismac_cflags=$(OPENSSL_CFLAGS)
TOOLS+=hcxpmkidtool
TOOLS+=hcxhashcattool
-hcxhashcattool_libs=-lcrypto -lssl -lpthread
-hcxpmkidtool_libs=-lcrypto -lssl -lpthread
+hcxhashcattool_libs=-lpthread $(OPENSSL_LIBS)
+hcxhashcattool_cflags=$(OPENSSL_CFLAGS)
+hcxpmkidtool_libs=-lpthread $(OPENSSL_LIBS)
+hcxpmkidtool_cflags=$(OPENSSL_CFLAGS)
TOOLS+=hcxmactool
TOOLS+=hcxessidtool
@@ -66,9 +72,10 @@ build: $(TOOLS)
define tool-build
$(1)_src ?= $(1).c
$(1)_libs ?=
+$(1)_cflags ?=
$(1): $$($(1)_src) | .deps
- $$(CC) $$(CFLAGS) $$(CPPFLAGS) -MMD -MF .deps/[email protected] -o $$@ $$($(1)_src) $$($(1)_libs) $$(LDFLAGS) $$(DEFS)
+ $$(CC) $$(CFLAGS) $$($(1)_cflags) $$(CPPFLAGS) -MMD -MF .deps/[email protected] -o $$@ $$($(1)_src) $$($(1)_libs) $$(LDFLAGS) $$(DEFS)
.deps/$(1).d: $(1)
|
data tree OPTIMIZE minor optimization | @@ -2344,7 +2344,8 @@ lyd_insert_get_next_anchor(const struct lyd_node *first_sibling, const struct ly
} else {
/* find the anchor without hashes */
match = (struct lyd_node *)first_sibling;
- if (!lysc_data_parent(new_node->schema)) {
+ sparent = lysc_data_parent(new_node->schema);
+ if (!sparent) {
/* we are in top-level, skip all the data from preceding modules */
LY_LIST_FOR(match, match) {
if (!match->schema || (strcmp(lyd_owner_module(match)->name, lyd_owner_module(new_node)->name) >= 0)) {
@@ -2354,7 +2355,6 @@ lyd_insert_get_next_anchor(const struct lyd_node *first_sibling, const struct ly
}
/* get the first schema sibling */
- sparent = lysc_data_parent(new_node->schema);
schema = lys_getnext(NULL, sparent, new_node->schema->module->compiled, getnext_opts);
found = 0;
|
Travis: Disable JNI plugin | @@ -55,7 +55,8 @@ before_script:
python3_ver=$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[:2])))') &&
CMAKE_OPT+=("-DPYTHON_INCLUDE_DIR:PATH=$(python3-config --prefix)/include/python${python3_ver}m") &&
CMAKE_OPT+=("-DPYTHON_LIBRARY:FILEPATH=$(python3-config --prefix)/lib/libpython${python3_ver}.dylib");
- if [[ $(uname -r | cut -d "." -f 1) == 15 ]]; then plugins="ALL;-CRYPTO"; fi;
+ plugins="ALL;-jni";
+ if [[ $(uname -r | cut -d "." -f 1) == 15 ]]; then plugins="${plugins};-CRYPTO"; fi;
ln -s /usr/local/opt/openssl/include/openssl/ /usr/local/include/openssl;
fi
- cmake -GNinja -DBUILD_STATIC=OFF -DPLUGINS="${plugins:-ALL}" -DBINDINGS=ALL -DTOOLS=ALL -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../install -DKDB_DB_SYSTEM=$TRAVIS_BUILD_DIR/../kdbsystem ${CMAKE_OPT[@]} $TRAVIS_BUILD_DIR
|
Provided translation of 'Hardware Reference' into Chinese | @@ -12,4 +12,4 @@ ESP32 Hardware Reference
Modules and Boards <modules-and-boards>
Previous Versions of Modules and Boards <modules-and-boards-previous>
Espressif Products Ordering Information (PDF) <http://www.espressif.com/sites/default/files/documentation/espressif_products_ordering_information_en.pdf>
- Regulatory Certificates <http://espressif.com/en/certificates?field_product_value%5B%5D=ESP32&field_product_value%5B%5D=ESP-WROOM-32&field_product_value%5B%5D=ESP32-WROVER>
+ Regulatory Certificates <https://www.espressif.com/en/certificates>
\ No newline at end of file
|
sysdeps/managarm: Add error handling to several sysdeps | @@ -3376,6 +3376,8 @@ int sys_openat(int dirfd, const char *path, int flags, int *fd) {
return EINVAL;
}else if(resp.error() == managarm::posix::Errors::NO_BACKING_DEVICE) {
return ENXIO;
+ }else if(resp.error() == managarm::posix::Errors::IS_DIRECTORY) {
+ return EISDIR;
}else{
__ensure(resp.error() == managarm::posix::Errors::SUCCESS);
*fd = resp.fd();
@@ -3867,6 +3869,8 @@ int sys_stat(fsfd_target fsfdt, int fd, const char *path, int flags, struct stat
return ENOENT;
}else if(resp.error() == managarm::posix::Errors::BAD_FD) {
return EBADF;
+ }else if(resp.error() == managarm::posix::Errors::NOT_A_DIRECTORY) {
+ return ENOTDIR;
}else{
__ensure(resp.error() == managarm::posix::Errors::SUCCESS);
memset(result, 0, sizeof(struct stat));
@@ -4105,6 +4109,8 @@ int sys_unlinkat(int fd, const char *path, int flags) {
return ENOENT;
}else if(resp.error() == managarm::posix::Errors::RESOURCE_IN_USE) {
return EBUSY;
+ }else if(resp.error() == managarm::posix::Errors::IS_DIRECTORY) {
+ return EISDIR;
}else{
__ensure(resp.error() == managarm::posix::Errors::SUCCESS);
return 0;
|
decoding net: reserve just the first 20 PML4 slots, not 512x20 slots | @@ -277,7 +277,7 @@ add_process(S, Enum, NewS) :-
% Reserve memory for the process, the OUT/PROC0 node is the one where
% initially the process (virtual) addresses are issued.
- NumBlocks is (20 * 512 * 512),
+ NumBlocks is (20 * 512),
Limit is (NumBlocks * (512 * 4096) - 1),
Size is Limit + 1,
%state_add_in_use(S3, region(OutId, block(0,Limit)), NewS),
|
Enable already fixed test in Travis-CI | @@ -34,10 +34,8 @@ matrix:
env: MULTI_FEATURES="sig-rsa enc-kw validate-primary-slot bootstrap" TEST=sim
- os: linux
env: MULTI_FEATURES="sig-ecdsa enc-kw validate-primary-slot" TEST=sim
-
- # FIXME: this test actually fails and must be fixed
- #- os: linux
- # env: MULTI_FEATURES="sig-rsa validate-primary-slot overwrite-only"
+ - os: linux
+ env: MULTI_FEATURES="sig-rsa validate-primary-slot overwrite-only" TEST=sim
- os: linux
language: go
|
Added missing date/time structure for the 'x' specifier. | @@ -1066,6 +1066,14 @@ parse_specifier (GLogItem * logitem, char **str, const char *p, const char *end)
free (tkn);
return 1;
}
+
+ logitem->dt.tm_year = tm.tm_year;
+ logitem->dt.tm_mon = tm.tm_mon;
+ logitem->dt.tm_mday = tm.tm_mday;
+
+ logitem->dt.tm_hour = tm.tm_hour;
+ logitem->dt.tm_min = tm.tm_min;
+ logitem->dt.tm_sec = tm.tm_sec;
break;
/* Virtual Host */
case 'v':
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.