summaryrefslogtreecommitdiff
path: root/lib/libcrypto/crypto
diff options
context:
space:
mode:
authorBrent Cook <bcook@cvs.openbsd.org>2015-01-07 01:15:58 +0000
committerBrent Cook <bcook@cvs.openbsd.org>2015-01-07 01:15:58 +0000
commit718449d2d6377de0a571be06f6897b390c608f38 (patch)
treeddd2bfd789946ba8a9e5a0d0ccbab6fafcdd3092 /lib/libcrypto/crypto
parent5e734a49697b660e945f012bf71f978b3f185aea (diff)
mix in more virtual memory and process information
Diffstat (limited to 'lib/libcrypto/crypto')
-rw-r--r--lib/libcrypto/crypto/getentropy_hpux.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libcrypto/crypto/getentropy_hpux.c b/lib/libcrypto/crypto/getentropy_hpux.c
index 46ab8f54d85..753c9af12b4 100644
--- a/lib/libcrypto/crypto/getentropy_hpux.c
+++ b/lib/libcrypto/crypto/getentropy_hpux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getentropy_hpux.c,v 1.1 2015/01/06 21:08:11 bcook Exp $ */
+/* $OpenBSD: getentropy_hpux.c,v 1.2 2015/01/07 01:15:57 bcook Exp $ */
/*
* Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -225,6 +225,7 @@ getentropy_fallback(void *buf, size_t len)
static int cnt;
struct timespec ts;
struct timeval tv;
+ struct pst_vminfo pvi;
struct pst_vm_status pvs;
struct pst_dynamic pdy;
struct rusage ru;
@@ -255,7 +256,8 @@ getentropy_fallback(void *buf, size_t len)
cnt += (int)tv.tv_usec;
}
- HX(pstat_getprocvm(&pvs, sizeof(pvs), 0, 0) != 1, pvs.pst_space);
+ HX(pstat_getvminfo(&pvi, sizeof(pvi), 1, 0) != 1, pvi);
+ HX(pstat_getprocvm(&pvs, sizeof(pvs), 0, 0) != 1, pvs);
for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++)
HX(clock_gettime(cl[ii], &ts) == -1, ts);