Merge branch 'FujiNetWIFI:master' into master

Author: shawnjefferson22

components/libarchive/lib/archive_write_set_format_7zip.c

@@ -310,11 +310,13 @@ static int	_7z_compression_init_encoder(struct archive_write *, unsigned,
 		    int);
 static int	compression_init_encoder_zstd(struct archive *,
 		    struct la_zstream *, int, int);
+#ifdef UNUSED
 #if defined(HAVE_ZSTD_H)
 static int	compression_code_zstd(struct archive *,
 		    struct la_zstream *, enum la_zaction);
 static int	compression_end_zstd(struct archive *, struct la_zstream *);
 #endif
+#endif /* UNUSED */
 static int	compression_code(struct archive *,
 		    struct la_zstream *, enum la_zaction);
 static int	compression_end(struct archive *,

components/liblzma/lib/check/crc32_tablegen.c

@@ -79,6 +79,7 @@ print_crc32_table(void)
 }
 
 
+#ifdef UNUSED
 static void
 print_lz_table(void)
 {
@@ -100,6 +101,7 @@ print_lz_table(void)
 
 	return;
 }
+#endif /* UNUSED */
 
 
 int

components/liblzma/lib/lzma/lzma_decoder.c

@@ -33,6 +33,7 @@
 
 #define len_decode(target, ld, pos_state, seq) \
 do { \
+  [[fallthrough]]; \
 case seq ## _CHOICE: \
 	rc_if_0(ld.choice, seq ## _CHOICE) { \
 		rc_update_0(ld.choice); \
@@ -41,6 +42,7 @@ case seq ## _CHOICE: \
 		target = MATCH_LEN_MIN; \
 	} else { \
 		rc_update_1(ld.choice); \
+                [[fallthrough]]; \
 case seq ## _CHOICE2: \
 		rc_if_0(ld.choice2, seq ## _CHOICE2) { \
 			rc_update_0(ld.choice2); \
@@ -56,6 +58,7 @@ case seq ## _CHOICE2: \
 		} \
 	} \
 	symbol = 1; \
+        [[fallthrough]]; \
 case seq ## _BITTREE: \
 	do { \
 		rc_bit(probs[symbol], , , seq ## _BITTREE); \
@@ -346,6 +349,7 @@ lzma_decode(lzma_coder *restrict coder, lzma_dict *restrict dictptr,
 		// since we already calculated it when setting up the local
 		// variables.
 		pos_state = dict.pos & pos_mask;
+                [[fallthrough]];
 
 	case SEQ_NORMALIZE:
 	case SEQ_IS_MATCH:
@@ -483,6 +487,7 @@ lzma_decode(lzma_coder *restrict coder, lzma_dict *restrict dictptr,
 		// output history.
 
 		rc_update_1(coder->is_match[state][pos_state]);
+                [[fallthrough]];
 
 	case SEQ_IS_REP:
 		rc_if_0(coder->is_rep[state], SEQ_IS_REP) {
@@ -687,6 +692,7 @@ lzma_decode(lzma_coder *restrict coder, lzma_dict *restrict dictptr,
 				ret = LZMA_DATA_ERROR;
 				goto out;
 			}
+                        [[fallthrough]];
 
 	case SEQ_IS_REP0:
 			rc_if_0(coder->is_rep0[state], SEQ_IS_REP0) {
@@ -718,6 +724,7 @@ lzma_decode(lzma_coder *restrict coder, lzma_dict *restrict dictptr,
 
 			} else {
 				rc_update_1(coder->is_rep0[state]);
+                                [[fallthrough]];
 
 	case SEQ_IS_REP1:
 				// The distance is rep1, rep2 or rep3. Once
@@ -733,6 +740,7 @@ lzma_decode(lzma_coder *restrict coder, lzma_dict *restrict dictptr,
 
 				} else {
 					rc_update_1(coder->is_rep1[state]);
+                                        [[fallthrough]];
 	case SEQ_IS_REP2:
 					rc_if_0(coder->is_rep2[state],
 							SEQ_IS_REP2) {
@@ -772,6 +780,7 @@ lzma_decode(lzma_coder *restrict coder, lzma_dict *restrict dictptr,
 		// to trigger the algorithm to set len outside this range.
 		assert(len >= MATCH_LEN_MIN);
 		assert(len <= MATCH_LEN_MAX);
+                [[fallthrough]];
 
 	case SEQ_COPY:
 		// Repeat len bytes from distance of rep0.

components/libssh/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.12)
+
+file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.c)
+
+idf_component_register(
+    INCLUDE_DIRS include src
+    SRCS ${SOURCES}
+    PRIV_REQUIRES esp_netif mbedtls
+)