--- rpl/src/rpl.h 2020/03/17 15:30:50 1.341 +++ rpl/src/rpl.h 2025/04/15 10:17:57 1.356 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.32 - Copyright (C) 1989-2020 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.36 + Copyright (C) 1989-2025 Dr. BERTRAND Joël This file is part of RPL/2. @@ -93,6 +93,7 @@ #include #include #include +#include #ifndef RPLARGS # include @@ -100,11 +101,9 @@ # include # include # include -# include # include # include # include -# include # include # include @@ -112,7 +111,6 @@ # include # include -# include # include # ifdef OS2 @@ -186,38 +184,40 @@ # include "zlib.h" # include "openssl/evp.h" -# ifndef OPENSSL_NO_MD2 -# include "openssl/md2.h" -# endif -# ifndef OPENSSL_NO_MD4 -# include "openssl/md4.h" -# endif -# ifndef OPENSSL_NO_MD5 -# include "openssl/md5.h" -# endif -# ifndef OPENSSL_NO_MDC2 -# include "openssl/mdc2.h" -# endif -# ifndef OPENSSL_NO_RIPEMD -# include "openssl/ripemd.h" -# endif -# ifndef OPENSSL_NO_SHA -# include "openssl/sha.h" -# endif -# ifndef OPENSSL_NO_WHIRLPOOL -# include "openssl/whrlpool.h" -# endif -# ifndef OPENSSL_NO_AES -# include "openssl/aes.h" -# endif -# ifndef OPENSSL_NO_CAMELLIA -# include "openssl/camellia.h" -# endif -# ifndef OPENSSL_NO_RC2 -# include "openssl/rc2.h" -# endif -# ifndef OPENSSL_NO_IDEA -# include "openssl/idea.h" +# ifndef RPLCXX +# ifndef OPENSSL_NO_MD2 +# include "openssl/md2.h" +# endif +# ifndef OPENSSL_NO_MD4 +# include "openssl/md4.h" +# endif +# ifndef OPENSSL_NO_MD5 +# include "openssl/md5.h" +# endif +# ifndef OPENSSL_NO_MDC2 +# include "openssl/mdc2.h" +# endif +# ifndef OPENSSL_NO_RIPEMD +# include "openssl/ripemd.h" +# endif +# ifndef OPENSSL_NO_SHA +# include "openssl/sha.h" +# endif +# ifndef OPENSSL_NO_WHIRLPOOL +# include "openssl/whrlpool.h" +# endif +# ifndef OPENSSL_NO_AES +# include "openssl/aes.h" +# endif +# ifndef OPENSSL_NO_CAMELLIA +# include "openssl/camellia.h" +# endif +# ifndef OPENSSL_NO_RC2 +# include "openssl/rc2.h" +# endif +# ifndef OPENSSL_NO_IDEA +# include "openssl/idea.h" +# endif # endif # include "sqlite3.h" @@ -269,8 +269,11 @@ #ifndef RPLARGS # ifndef UNIX_PATH_MAX - struct sockaddr_un sizecheck; +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-variable" + static struct sockaddr_un sizecheck; # define UNIX_PATH_MAX sizeof(sizecheck.sun_path) +# pragma GCC diagnostic pop # endif #endif @@ -1131,7 +1134,8 @@ void debug_memoire_verification(); #define VIN __RPL_VIN #define VRL __RPL_VRL -enum t_rplcas_commandes { RPLCAS_INTEGRATION = 0, RPLCAS_LIMITE }; +enum t_rplcas_commandes { RPLCAS_INTEGRATION = 0, RPLCAS_LIMITE, + RPLCAS_SIMPLIFICATION }; enum t_type { ADR = 0, ALG, BIN, CHN, CPL, EXT, FCH, FCT, INT, LST, MCX, MIN, MRL, MTX, NOM, NON, PRC, REC, REL, RPN, SCK, @@ -1348,7 +1352,7 @@ typedef struct descripteur_fichier pid_t pid; pthread_t tid; - union + struct { file *descripteur_c; sqlite3 *descripteur_sqlite; @@ -2668,6 +2672,7 @@ void instruction_clrcntxt(struct_process void instruction_clrerr(struct_processus *s_etat_processus); void instruction_clrfuse(struct_processus *s_etat_processus); void instruction_clrmtx(struct_processus *s_etat_processus); +void instruction_clrsock(struct_processus *s_etat_processus); void instruction_clrsmphr(struct_processus *s_etat_processus); void instruction_clrswi(struct_processus *s_etat_processus); void instruction_cls(struct_processus *s_etat_processus); @@ -3438,7 +3443,8 @@ unsigned char *chiffrement(struct_proces logical1 encodage, unsigned char *message, integer8 longueur_message, unsigned char *clef, integer8 longueur_clef, unsigned char *vecteur_initialisation, - integer8 *longueur_message_chiffre); + integer8 *longueur_message_chiffre, + unsigned char padding); unsigned char *compactage(struct_processus *s_etat_processus, unsigned char *chaine); unsigned char *conversion_majuscule(struct_processus *s_etat_processus,