diff options
author | Colin Watson <cjwatson@debian.org> | 2020-02-21 11:57:14 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-02-21 11:57:14 +0000 |
commit | f0de78bd4f29fa688c5df116f3f9cd43543a76d0 (patch) | |
tree | 856b0dee3f2764c13a32dad5ffe2424fab7fef41 /entropy.c | |
parent | 4213eec74e74de6310c27a40c3e9759a08a73996 (diff) | |
parent | 8aa3455b16fddea4c0144a7c4a1edb10ec67dcc8 (diff) |
Import openssh_8.2p1.orig.tar.gz
Diffstat (limited to 'entropy.c')
-rw-r--r-- | entropy.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -84,7 +84,7 @@ get_random_bytes_prngd(unsigned char *buf, int len, | |||
84 | struct sockaddr_storage addr; | 84 | struct sockaddr_storage addr; |
85 | struct sockaddr_in *addr_in = (struct sockaddr_in *)&addr; | 85 | struct sockaddr_in *addr_in = (struct sockaddr_in *)&addr; |
86 | struct sockaddr_un *addr_un = (struct sockaddr_un *)&addr; | 86 | struct sockaddr_un *addr_un = (struct sockaddr_un *)&addr; |
87 | mysig_t old_sigpipe; | 87 | sshsig_t old_sigpipe; |
88 | 88 | ||
89 | /* Sanity checks */ | 89 | /* Sanity checks */ |
90 | if (socket_path == NULL && tcp_port == 0) | 90 | if (socket_path == NULL && tcp_port == 0) |
@@ -110,7 +110,7 @@ get_random_bytes_prngd(unsigned char *buf, int len, | |||
110 | strlen(socket_path) + 1; | 110 | strlen(socket_path) + 1; |
111 | } | 111 | } |
112 | 112 | ||
113 | old_sigpipe = signal(SIGPIPE, SIG_IGN); | 113 | old_sigpipe = ssh_signal(SIGPIPE, SIG_IGN); |
114 | 114 | ||
115 | errors = 0; | 115 | errors = 0; |
116 | rval = -1; | 116 | rval = -1; |
@@ -160,7 +160,7 @@ reopen: | |||
160 | 160 | ||
161 | rval = 0; | 161 | rval = 0; |
162 | done: | 162 | done: |
163 | signal(SIGPIPE, old_sigpipe); | 163 | ssh_signal(SIGPIPE, old_sigpipe); |
164 | if (fd != -1) | 164 | if (fd != -1) |
165 | close(fd); | 165 | close(fd); |
166 | return rval; | 166 | return rval; |