diff options
| author | Zack Weinberg <zackw@panix.com> | 2018-06-29 16:53:18 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2018-06-29 16:53:18 +0200 |
| commit | b10a0accee709a5efff2fadf0b0bbb79ff0ad759 (patch) | |
| tree | 27796fe83ec5f82a8f36a36afa169fe6dddf8b27 /sunrpc | |
| parent | 524d796d5f52913d5d33edede74a5075dbda25ca (diff) | |
| download | glibc-b10a0accee709a5efff2fadf0b0bbb79ff0ad759.tar.gz glibc-b10a0accee709a5efff2fadf0b0bbb79ff0ad759.tar.xz glibc-b10a0accee709a5efff2fadf0b0bbb79ff0ad759.zip | |
Disallow use of DES encryption functions in new programs.
The functions encrypt, setkey, encrypt_r, setkey_r, cbc_crypt, ecb_crypt, and des_setparity should not be used in new programs, because they use the DES block cipher, which is unacceptably weak by modern standards. Demote all of them to compatibility symbols, and remove their prototypes from installed headers. cbc_crypt, ecb_crypt, and des_setparity were already compat symbols when glibc was configured with --disable-obsolete-rpc. POSIX requires encrypt and setkey to be available when _XOPEN_CRYPT is defined, so this change also removes the definition of X_OPEN_CRYPT from <unistd.h>. The entire "DES Encryption" section is dropped from the manual, as is the mention of AUTH_DES and FIPS 140-2 in the introduction to crypt.texi. The documentation of 'memfrob' cross-referenced the DES Encryption section, which is replaced by a hyperlink to libgcrypt, and while I was in there I spruced up the actual documentation of 'memfrob' and 'strfry' a little. It's still fairly jokey, because those functions _are_ jokes, but they do also have real use cases, so people trying to use them for real should have all the information they need. DES-based authentication for Sun RPC is also insecure and should be deprecated or even removed, but maybe that can be left as TI-RPC's problem.
Diffstat (limited to 'sunrpc')
| -rw-r--r-- | sunrpc/Makefile | 2 | ||||
| -rw-r--r-- | sunrpc/des_crypt.c | 7 | ||||
| -rw-r--r-- | sunrpc/des_soft.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sunrpc/Makefile b/sunrpc/Makefile index 0e2f8d7c9e..85b0b3356a 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -51,7 +51,7 @@ rpcsvc = bootparam_prot.x nlm_prot.x rstat.x \ headers-sunrpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h \ svc.h svc_auth.h types.h xdr.h auth_des.h \ - des_crypt.h key_prot.h rpc_des.h) \ + key_prot.h) \ $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h headers = rpc/netdb.h install-others = $(inst_sysconfdir)/rpc diff --git a/sunrpc/des_crypt.c b/sunrpc/des_crypt.c index a4d8b2936b..9b4bd2d5dd 100644 --- a/sunrpc/des_crypt.c +++ b/sunrpc/des_crypt.c @@ -86,6 +86,9 @@ common_crypt (char *key, char *buf, register unsigned len, return desdev == DES_SW ? DESERR_NONE : DESERR_NOHWDEVICE; } +/* Note: these cannot be excluded from the build yet, because they are + still used internally. */ + /* * CBC mode encryption */ @@ -102,7 +105,7 @@ cbc_crypt (char *key, char *buf, unsigned int len, unsigned int mode, COPY8 (dp.des_ivec, ivec); return err; } -libc_hidden_nolink_sunrpc (cbc_crypt, GLIBC_2_1) +hidden_nolink (cbc_crypt, libc, GLIBC_2_1) /* * ECB mode encryption @@ -115,4 +118,4 @@ ecb_crypt (char *key, char *buf, unsigned int len, unsigned int mode) dp.des_mode = ECB; return common_crypt (key, buf, len, mode, &dp); } -libc_hidden_nolink_sunrpc (ecb_crypt, GLIBC_2_1) +hidden_nolink (ecb_crypt, libc, GLIBC_2_1) diff --git a/sunrpc/des_soft.c b/sunrpc/des_soft.c index f884f8f21b..a87de96cc7 100644 --- a/sunrpc/des_soft.c +++ b/sunrpc/des_soft.c @@ -71,4 +71,4 @@ des_setparity (char *p) p++; } } -libc_hidden_nolink_sunrpc (des_setparity, GLIBC_2_1) +hidden_nolink (des_setparity, libc, GLIBC_2_1) |