Merge pull request #391 from eclipse-threadx/dev

Merging changes for the v.6.5.1.202602 release

Author: fdesbiens

addons/BSD/nxd_bsd.c

@@ -238,6 +238,7 @@ extern   "C" {
 #define nx_bsd_inet_ntop        inet_ntop
 #define nx_bsd_listen           listen
 #define nx_bsd_recvfrom         recvfrom
+#define nx_bsd_recvfromto       recvfromto
 #define nx_bsd_recv             recv
 #define nx_bsd_recvmsg          recvmsg
 #define nx_bsd_sendto           sendto
@@ -300,6 +301,7 @@ extern   "C" {
 #define     AF_INET                         2                       /* IPv4 socket (UDP, TCP, etc)                                          */
 #define     AF_INET6                        3                       /* IPv6 socket (UDP, TCP, etc)                                          */
 #define     AF_PACKET                       4                       /* Raw Packet type (Link Layer packets)                                 */
+#define     AF_MAX                          AF_PACKET
 
 /* Protocol families, same as address families.  */
 #define     PF_INET                         AF_INET
@@ -570,6 +572,8 @@ extern   "C" {
 
 /*  This second set of socket options take the socket level (category) IPPROTO_IP. */
 
+#define IP_TOS              25 /* Type Of Service */
+#define IP_TTL              26 /* Specify the TTL value. */
 #define IP_MULTICAST_IF     27 /* Specify outgoing multicast interface */
 #define IP_MULTICAST_TTL    28 /* Specify the TTL value to use for outgoing multicast packet. */
 #define IP_MULTICAST_LOOP   29 /* Whether or not receive the outgoing multicast packet, loopbacloopbackk mode. */
@@ -960,6 +964,8 @@ typedef struct NX_BSD_SOCKET_STRUCT
     INT                 nx_bsd_option_linger_time;
     UINT                nx_bsd_option_linger_time_closed;
     UINT                nx_bsd_option_linger_start_close;
+    struct nx_bsd_linger
+                        nx_bsd_option_linger;
     UINT                nx_bsd_socket_time_wait_remaining;
     ULONG               nx_bsd_option_receive_timeout;
     ULONG               nx_bsd_option_send_timeout;
@@ -1009,6 +1015,7 @@ VOID nx_bsd_raw_receive_notify(NX_IP *ip_ptr, UINT bsd_socket_index);
 #endif
 UINT nx_bsd_socket_set_inherited_settings(UINT master_sock_id, UINT secondary_sock_id);
 INT  nx_bsd_recvfrom(INT sockID, CHAR *buffer, INT buffersize, INT flags,struct nx_bsd_sockaddr *fromAddr, INT *fromAddrLen);
+INT  nx_bsd_recvfromto(INT sockID, CHAR *rcvBuffer, INT bufferLength, INT flags, struct nx_bsd_sockaddr *fromAddr, INT *fromAddrLen, struct nx_bsd_sockaddr *toAddr, INT *toAddrLen);
 INT  nx_bsd_recv(INT sockID, VOID *rcvBuffer, INT bufferLength, INT flags);
 INT  nx_bsd_recvmsg(INT sockID, struct nx_bsd_msghdr *msg, INT flags);
 INT  nx_bsd_sendto(INT sockID, CHAR *msg, INT msgLength, INT flags, struct nx_bsd_sockaddr *destAddr, INT destAddrLen);

addons/BSD/nxd_bsd.h

@@ -8,6 +8,7 @@
  *
  * SPDX-License-Identifier: MIT
  **************************************************************************/
+// Some portions generated by Copilot (Sonnet 4.6).
 
 
 /**************************************************************************/
@@ -81,7 +82,8 @@ NX_CALLER_CHECKING_EXTERNS
 #define NX_FTP_CODE_BAD_NAME         "553"  /* Requested action not taken, File name not allowed.  */
 
 static VOID _nx_ftp_server_number_to_ascii(UCHAR *buffer_ptr, UINT buffer_size, UINT number, UCHAR pad);
-                                   
+static VOID _nx_ftp_server_logout_client(NX_FTP_SERVER *ftp_server_ptr, NX_FTP_CLIENT_REQUEST *client_request_ptr);
+
 /**************************************************************************/
 /*                                                                        */
 /*  FUNCTION                                               RELEASE        */
@@ -1445,6 +1447,7 @@ ULONG                   events;
 /*    nx_tcp_socket_transmit_configure      Configure data transer socket */
 /*    _nx_utility_uint_to_string            Convert number to string      */
 /*    _nx_ftp_server_data_socket_cleanup    Clean up data socket          */
+/*    _nx_ftp_server_logout_client          Logout the client             */
 /*                                                                        */
 /*  CALLED BY                                                             */
 /*                                                                        */
@@ -1720,41 +1723,8 @@ ULONG                   block_size;
                     /* Increment the number of disconnection requests.  */
                     ftp_server_ptr -> nx_ftp_server_disconnection_requests++;
 
-                    /* Check if this client login.  */
-                    if (client_req_ptr -> nx_ftp_client_request_login)
-                    {
-
-                        /* Call the logout function.  */
-
-#ifndef NX_DISABLE_IPV4
-                        /* Does this server have an IPv4 login function? */
-                        if (ftp_server_ptr -> nx_ftp_logout_ipv4)
-                        {
-
-                            /* Call the logout which takes IPv4 address input. */
-                            (ftp_server_ptr -> nx_ftp_logout_ipv4)(ftp_server_ptr, 
-                                    client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip.nxd_ip_address.v4,
-                                    client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
-                                    client_req_ptr -> nx_ftp_client_request_username,
-                                    client_req_ptr -> nx_ftp_client_request_password, NX_NULL);
-                        }
-#endif /* NX_DISABLE_IPV4 */
-                        if (ftp_server_ptr -> nx_ftp_logout)
-                        {
-
-                            /* Call the 'duo' logout function which takes IPv6 or IPv4 IP addresses. */
-                            (ftp_server_ptr -> nx_ftp_logout)(ftp_server_ptr, &(client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip),
-                                                            client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
-                                                            client_req_ptr -> nx_ftp_client_request_username,
-                                                            client_req_ptr -> nx_ftp_client_request_password, NX_NULL);
-                        }
-
-                        /* Set the login as FALSE.  */
-                        client_req_ptr -> nx_ftp_client_request_login = NX_FALSE;
-                    }
-                    
-                    /* Clear authentication.  */
-                    client_req_ptr -> nx_ftp_client_request_authenticated =  NX_FALSE;
+                    /* Logout the client.  */
+                    _nx_ftp_server_logout_client(ftp_server_ptr, client_req_ptr);
 
                     /* Now send a successful response to the client.  */
                     _nx_ftp_server_response(&(client_req_ptr -> nx_ftp_client_request_control_socket), packet_ptr,
@@ -4554,6 +4524,7 @@ NX_FTP_SERVER   *server_ptr;
 /*    fx_file_close                         Close file                    */
 /*    nx_ftp_packet_allocate                Allocate a packet             */
 /*    _nx_ftp_server_data_socket_cleanup    Clean up data socket          */
+/*    _nx_ftp_server_logout_client          Logout the client             */
 /*                                                                        */
 /*  CALLED BY                                                             */
 /*                                                                        */
@@ -5133,6 +5104,7 @@ NX_FTP_SERVER   *server_ptr;
 /*    nx_tcp_server_socket_unaccept         Unaccept server connection    */
 /*    nx_tcp_socket_disconnect              Disconnect socket             */
 /*    _nx_ftp_server_data_socket_cleanup    Clean up data socket          */
+/*    _nx_ftp_server_logout_client          Logout the client             */
 /*                                                                        */
 /*  CALLED BY                                                             */
 /*                                                                        */
@@ -5187,6 +5159,9 @@ NX_FTP_CLIENT_REQUEST   *client_req_ptr;
                 /* Reset the block bytes.  */
                 client_req_ptr -> nx_ftp_client_request_block_bytes = 0;
 
+                /* Logout the client. */
+                _nx_ftp_server_logout_client(ftp_server_ptr, client_req_ptr);
+
                 /* Now disconnect the command socket.  */
                 nx_tcp_socket_disconnect(&(client_req_ptr -> nx_ftp_client_request_control_socket), NX_NO_WAIT);
 
@@ -5324,9 +5299,6 @@ NX_FTP_CLIENT_REQUEST   *client_req_ptr;
             /* Increment the number of disconnection requests.  */
             ftp_server_ptr -> nx_ftp_server_disconnection_requests++;
 
-            /* Clear authentication.  */
-            client_req_ptr -> nx_ftp_client_request_authenticated =  NX_FALSE;
-
             /* Disable the client request activity timeout.  */
             client_req_ptr -> nx_ftp_client_request_activity_timeout =  0;
 
@@ -5344,38 +5316,8 @@ NX_FTP_CLIENT_REQUEST   *client_req_ptr;
             /* Reset the block bytes.  */
             client_req_ptr -> nx_ftp_client_request_block_bytes = 0;
 
-            /* Check if this client login.  */
-            if (client_req_ptr -> nx_ftp_client_request_login)
-            {
-
-                /* Call the logout function.  */
-
-#ifndef NX_DISABLE_IPV4
-                /* Does this server have an IPv4 login function? */
-                if (ftp_server_ptr -> nx_ftp_logout_ipv4)
-                {
-
-                    /* Call the logout which takes IPv4 address input. */
-                    (ftp_server_ptr -> nx_ftp_logout_ipv4)(ftp_server_ptr, 
-                                client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip.nxd_ip_address.v4,
-                                client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
-                                client_req_ptr -> nx_ftp_client_request_username,
-                                client_req_ptr -> nx_ftp_client_request_password, NX_NULL);
-                }
-#endif /* NX_DISABLE_IPV4 */
-                if (ftp_server_ptr -> nx_ftp_logout)
-                {
-
-                    /* Call the 'duo' logout function which takes IPv6 or IPv4 IP addresses. */
-                    (ftp_server_ptr -> nx_ftp_logout)(ftp_server_ptr, &(client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip),
-                                                      client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
-                                                      client_req_ptr -> nx_ftp_client_request_username,
-                                                      client_req_ptr -> nx_ftp_client_request_password, NX_NULL);
-                }
-
-                /* Set the login as FALSE.  */
-                client_req_ptr -> nx_ftp_client_request_login = NX_FALSE;
-            }
+            /* Logout the client. */
+            _nx_ftp_server_logout_client(ftp_server_ptr, client_req_ptr);
 
             /* Now disconnect the command socket.  */
             nx_tcp_socket_disconnect(&(client_req_ptr -> nx_ftp_client_request_control_socket), NX_FTP_SERVER_TIMEOUT);
@@ -6498,6 +6440,85 @@ UINT    size;
     }
 }
 
+/**************************************************************************/
+/*                                                                        */
+/*  FUNCTION                                               RELEASE        */
+/*                                                                        */
+/*    _nx_ftp_server_logout_client                        PORTABLE C      */
+/*                                                           6.4.3        */
+/*  AUTHOR                                                                */
+/*                                                                        */
+/*    Yuxin Zhou                                                           */
+/*    Valentin Batz                                                        */
+/*                                                                        */
+/*  DESCRIPTION                                                           */
+/*                                                                        */
+/*   This function logs out the client if it was previously logged in     */
+/*   and resets the authenticated flag so the next connection on this     */
+/*   socket slot must perform a fresh login.                              */
+/*                                                                        */
+/*   INPUT                                                                */
+/*                                                                        */
+/*    ftp_server_ptr                        Pointer to FTP server         */
+/*    client_request_ptr                    Pointer to FTP client         */
+/*                                                                        */
+/*  OUTPUT                                                                */
+/*                                                                        */
+/*    None                                                                */
+/*                                                                        */
+/*  CALLS                                                                 */
+/*                                                                        */
+/*    None                                                                */
+/*                                                                        */
+/*  CALLED BY                                                             */
+/*     _nx_ftp_server_control_disconnect_processing                       */
+/*                                     Disconnect processing              */
+/*     _nx_ftp_server_command_process                                     */
+/*                                     QUIT command                       */
+/*     _nx_ftp_server_timeout_processing                                  */
+/*                                     Timeout processing                 */
+/*                                                                        */
+/**************************************************************************/
+
+static VOID _nx_ftp_server_logout_client(NX_FTP_SERVER *ftp_server_ptr, NX_FTP_CLIENT_REQUEST *client_request_ptr)
+{
+    /* Check if this client login.  */
+    if (client_request_ptr -> nx_ftp_client_request_login)
+    {
+
+        /* Call the logout function.  */
+
+#ifndef NX_DISABLE_IPV4
+        /* Does this server have an IPv4 logout function? */
+        if (ftp_server_ptr -> nx_ftp_logout_ipv4)
+        {
+
+            /* Call the logout which takes IPv4 address input. */
+            (ftp_server_ptr -> nx_ftp_logout_ipv4)(ftp_server_ptr,
+                    client_request_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip.nxd_ip_address.v4,
+                    client_request_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
+                    client_request_ptr -> nx_ftp_client_request_username,
+                    client_request_ptr -> nx_ftp_client_request_password, NX_NULL);
+        }
+#endif /* NX_DISABLE_IPV4 */
+        if (ftp_server_ptr -> nx_ftp_logout)
+        {
+
+            /* Call the 'duo' logout function which takes IPv6 or IPv4 IP addresses. */
+            (ftp_server_ptr -> nx_ftp_logout)(ftp_server_ptr, &(client_request_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip),
+                                            client_request_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
+                                            client_request_ptr -> nx_ftp_client_request_username,
+                                            client_request_ptr -> nx_ftp_client_request_password, NX_NULL);
+        }
+
+        /* Clear the login flag.  */
+        client_request_ptr -> nx_ftp_client_request_login = NX_FALSE;
+    }
+
+    /* Always clear authenticated so the next connection on this socket slot
+       must perform a fresh USER/PASS exchange.  */
+    client_request_ptr -> nx_ftp_client_request_authenticated = NX_FALSE;
+}
 
 /**************************************************************************/ 
 /*                                                                        */ 

addons/ftp/nxd_ftp_server.c

@@ -3838,7 +3838,7 @@ UINT        temp_realm_length = 0;
                                       "NetX HTTP File Open Failed", sizeof("NetX HTTP File Open Failed") - 1, NX_NULL, 0);
 
         /* Error, return to caller. */
-        goto put_process_end;
+        return;
     }
 
 

addons/http/nxd_http_server.c

@@ -455,8 +455,8 @@ VOID _nx_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, ULONG
 #define AZURE_RTOS_NETXDUO
 #define NETXDUO_MAJOR_VERSION                    6
 #define NETXDUO_MINOR_VERSION                    5
-#define NETXDUO_PATCH_VERSION                    0
-#define NETXDUO_BUILD_VERSION                    202601
+#define NETXDUO_PATCH_VERSION                    1
+#define NETXDUO_BUILD_VERSION                    202602
 #define NETXDUO_HOTFIX_VERSION                   ' '
 
 /* Define the following symbols for backward compatibility */

common/inc/nx_api.h

@@ -259,7 +259,7 @@ ULONG        *ethernet_frame_ptr;
 
 #ifdef NX_DEBUG
         printf("NetX RAM Driver Initialization - %s\n", ip_ptr -> nx_ip_name);
-        printf("  IP Address =%08X\n", ip_ptr -> nx_ip_address);
+        printf("  IP Address =%08lX\n", ip_ptr -> nx_ip_address);
 #endif
 
         /* Once the Ethernet controller is initialized, the driver needs to

common/src/nx_ram_network_driver.c

@@ -150,6 +150,7 @@ extern   "C" {
 #define NX_CRYPTO_DIGITAL_SIGNATURE_RSA          0x00050001
 #define NX_CRYPTO_DIGITAL_SIGNATURE_DSA          0x00050002
 #define NX_CRYPTO_DIGITAL_SIGNATURE_ECDSA        0x00050003
+#define NX_CRYPTO_DIGITAL_SIGNATURE_RSAPSS       0x00050004
 
 /*Define the elliptic curve algorithm */
 /* Values of 16 least significant bits are the same as named curve defined in RFC 4492, section 5.1.1 */

crypto_libraries/inc/nx_crypto_const.h

@@ -116,6 +116,12 @@ UINT _nx_crypto_method_rsa_init(struct NX_CRYPTO_METHOD_STRUCT *method,
                                 VOID **handle,
                                 VOID *crypto_metadata, ULONG crypto_metadata_size);
 
+UINT _nx_crypto_rsa_pss_verify(const UCHAR *message_hash, UINT hash_length,
+                                const UCHAR *em, UINT em_bits,
+                                const NX_CRYPTO_METHOD *hash_method,
+                                VOID *hash_metadata, ULONG hash_metadata_size,
+                                UCHAR *scratch, UINT scratch_length);
+
 #ifdef __cplusplus
 }
 #endif

crypto_libraries/inc/nx_crypto_rsa.h

@@ -94,7 +94,7 @@ NX_CRYPTO_KEEP UINT  _nx_crypto_method_hkdf_init(struct  NX_CRYPTO_METHOD_STRUCT
 
     /* Initialize IKM with key data. */
     hkdf->nx_crypto_hkdf_ikm = key;
-    hkdf->nx_crypto_hkdf_ikm_length = (key_size_in_bits << 3);
+    hkdf->nx_crypto_hkdf_ikm_length = (key_size_in_bits >> 3);
 
     /* Initialize HMAC and HASH methods. */
     hkdf->nx_crypto_hmac_method = NX_CRYPTO_NULL;