diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/arc4random/getentropy_hpux.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/crypto/getentropy_hpux.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/libcrypto/arc4random/getentropy_hpux.c b/src/lib/libcrypto/arc4random/getentropy_hpux.c index 46ab8f54d8..753c9af12b 100644 --- a/src/lib/libcrypto/arc4random/getentropy_hpux.c +++ b/src/lib/libcrypto/arc4random/getentropy_hpux.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: getentropy_hpux.c,v 1.1 2015/01/06 21:08:11 bcook Exp $ */ | 1 | /* $OpenBSD: getentropy_hpux.c,v 1.2 2015/01/07 01:15:57 bcook Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> | 4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> |
| @@ -225,6 +225,7 @@ getentropy_fallback(void *buf, size_t len) | |||
| 225 | static int cnt; | 225 | static int cnt; |
| 226 | struct timespec ts; | 226 | struct timespec ts; |
| 227 | struct timeval tv; | 227 | struct timeval tv; |
| 228 | struct pst_vminfo pvi; | ||
| 228 | struct pst_vm_status pvs; | 229 | struct pst_vm_status pvs; |
| 229 | struct pst_dynamic pdy; | 230 | struct pst_dynamic pdy; |
| 230 | struct rusage ru; | 231 | struct rusage ru; |
| @@ -255,7 +256,8 @@ getentropy_fallback(void *buf, size_t len) | |||
| 255 | cnt += (int)tv.tv_usec; | 256 | cnt += (int)tv.tv_usec; |
| 256 | } | 257 | } |
| 257 | 258 | ||
| 258 | HX(pstat_getprocvm(&pvs, sizeof(pvs), 0, 0) != 1, pvs.pst_space); | 259 | HX(pstat_getvminfo(&pvi, sizeof(pvi), 1, 0) != 1, pvi); |
| 260 | HX(pstat_getprocvm(&pvs, sizeof(pvs), 0, 0) != 1, pvs); | ||
| 259 | 261 | ||
| 260 | for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++) | 262 | for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++) |
| 261 | HX(clock_gettime(cl[ii], &ts) == -1, ts); | 263 | HX(clock_gettime(cl[ii], &ts) == -1, ts); |
diff --git a/src/lib/libcrypto/crypto/getentropy_hpux.c b/src/lib/libcrypto/crypto/getentropy_hpux.c index 46ab8f54d8..753c9af12b 100644 --- a/src/lib/libcrypto/crypto/getentropy_hpux.c +++ b/src/lib/libcrypto/crypto/getentropy_hpux.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: getentropy_hpux.c,v 1.1 2015/01/06 21:08:11 bcook Exp $ */ | 1 | /* $OpenBSD: getentropy_hpux.c,v 1.2 2015/01/07 01:15:57 bcook Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> | 4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> |
| @@ -225,6 +225,7 @@ getentropy_fallback(void *buf, size_t len) | |||
| 225 | static int cnt; | 225 | static int cnt; |
| 226 | struct timespec ts; | 226 | struct timespec ts; |
| 227 | struct timeval tv; | 227 | struct timeval tv; |
| 228 | struct pst_vminfo pvi; | ||
| 228 | struct pst_vm_status pvs; | 229 | struct pst_vm_status pvs; |
| 229 | struct pst_dynamic pdy; | 230 | struct pst_dynamic pdy; |
| 230 | struct rusage ru; | 231 | struct rusage ru; |
| @@ -255,7 +256,8 @@ getentropy_fallback(void *buf, size_t len) | |||
| 255 | cnt += (int)tv.tv_usec; | 256 | cnt += (int)tv.tv_usec; |
| 256 | } | 257 | } |
| 257 | 258 | ||
| 258 | HX(pstat_getprocvm(&pvs, sizeof(pvs), 0, 0) != 1, pvs.pst_space); | 259 | HX(pstat_getvminfo(&pvi, sizeof(pvi), 1, 0) != 1, pvi); |
| 260 | HX(pstat_getprocvm(&pvs, sizeof(pvs), 0, 0) != 1, pvs); | ||
| 259 | 261 | ||
| 260 | for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++) | 262 | for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++) |
| 261 | HX(clock_gettime(cl[ii], &ts) == -1, ts); | 263 | HX(clock_gettime(cl[ii], &ts) == -1, ts); |
