upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix enum warning in keyserv

Browse source 
This fixes a clang 19 warning:

    usr.sbin/keyserv/crypt_server.c:237:53: error: comparison of different enumeration types ('des_mode' (aka 'enum des_mode') and 'enum desmode') [-Werror,-Wenum-compare]
      237 |         if (_my_crypt != &_arcfour_crypt && argp->des_mode == CBC) {
          |                                             ~~~~~~~~~~~~~~ ^  ~~~

The type of `argp->des_mode` (aka `desargs::des_mode`) is `enum
des_mode` from `/usr/include/rpcsvc/crypt.h`, not `enum desmode` from
`/usr/include/rpc/des.h` (which is used in `struct desparams`).

Luckily the integer values of `enum desmode`'s `CBC` and `ECB` are
identical to those of `enum des_mode`'s `CBC_DES` and `ECB_DES`, so
replace both values.

MFC after:	3 days

(cherry picked from commit 1d5a5500ad)
This commit is contained in:
Dimitry Andric 2024-07-31 00:35:03 +02:00
parent 7ffa2d91fb
commit fa59de726f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr.sbin/keyserv/crypt_server.c
View file

@ -236,9 +236,9 @@ des_crypt_1_svc(desargs *argp, struct svc_req *rqstp)
* getting ECB mode.
*/
#ifdef BROKEN_DES
if (_my_crypt != &_arcfour_crypt && argp->des_mode == CBC) {
if (_my_crypt != &_arcfour_crypt && argp->des_mode == CBC_DES) {
#else
if (_my_crypt != &_arcfour_crypt && argp->des_mode == ECB) {
if (_my_crypt != &_arcfour_crypt && argp->des_mode == ECB_DES) {
#endif
int i;
char *dptr;