diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/arc4random/getentropy_aix.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/crypto/getentropy_aix.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libcrypto/arc4random/getentropy_aix.c b/src/lib/libcrypto/arc4random/getentropy_aix.c index 644a32a909..978bd144c0 100644 --- a/src/lib/libcrypto/arc4random/getentropy_aix.c +++ b/src/lib/libcrypto/arc4random/getentropy_aix.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: getentropy_aix.c,v 1.1 2015/03/30 11:29:48 bcook Exp $ */ | 1 | /* $OpenBSD: getentropy_aix.c,v 1.2 2015/04/27 03:34:43 bcook Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2015 Michael Felt <aixtools@gmail.com> | 4 | * Copyright (c) 2015 Michael Felt <aixtools@gmail.com> |
| @@ -222,7 +222,9 @@ getentropy_fallback(void *buf, size_t len) | |||
| 222 | struct timespec ts; | 222 | struct timespec ts; |
| 223 | struct timeval tv; | 223 | struct timeval tv; |
| 224 | perfstat_cpu_total_t cpustats; | 224 | perfstat_cpu_total_t cpustats; |
| 225 | #ifdef _AIX61 | ||
| 225 | perfstat_cpu_total_wpar_t cpustats_wpar; | 226 | perfstat_cpu_total_wpar_t cpustats_wpar; |
| 227 | #endif | ||
| 226 | perfstat_partition_total_t lparstats; | 228 | perfstat_partition_total_t lparstats; |
| 227 | perfstat_disk_total_t diskinfo; | 229 | perfstat_disk_total_t diskinfo; |
| 228 | perfstat_netinterface_total_t netinfo; | 230 | perfstat_netinterface_total_t netinfo; |
| @@ -257,8 +259,10 @@ getentropy_fallback(void *buf, size_t len) | |||
| 257 | HX(perfstat_cpu_total(NULL, &cpustats, | 259 | HX(perfstat_cpu_total(NULL, &cpustats, |
| 258 | sizeof(cpustats), 1) == -1, cpustats); | 260 | sizeof(cpustats), 1) == -1, cpustats); |
| 259 | 261 | ||
| 262 | #ifdef _AIX61 | ||
| 260 | HX(perfstat_cpu_total_wpar(NULL, &cpustats_wpar, | 263 | HX(perfstat_cpu_total_wpar(NULL, &cpustats_wpar, |
| 261 | sizeof(cpustats_wpar), 1) == -1, cpustats_wpar); | 264 | sizeof(cpustats_wpar), 1) == -1, cpustats_wpar); |
| 265 | #endif | ||
| 262 | 266 | ||
| 263 | HX(perfstat_partition_total(NULL, &lparstats, | 267 | HX(perfstat_partition_total(NULL, &lparstats, |
| 264 | sizeof(lparstats), 1) == -1, lparstats); | 268 | sizeof(lparstats), 1) == -1, lparstats); |
diff --git a/src/lib/libcrypto/crypto/getentropy_aix.c b/src/lib/libcrypto/crypto/getentropy_aix.c index 644a32a909..978bd144c0 100644 --- a/src/lib/libcrypto/crypto/getentropy_aix.c +++ b/src/lib/libcrypto/crypto/getentropy_aix.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: getentropy_aix.c,v 1.1 2015/03/30 11:29:48 bcook Exp $ */ | 1 | /* $OpenBSD: getentropy_aix.c,v 1.2 2015/04/27 03:34:43 bcook Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2015 Michael Felt <aixtools@gmail.com> | 4 | * Copyright (c) 2015 Michael Felt <aixtools@gmail.com> |
| @@ -222,7 +222,9 @@ getentropy_fallback(void *buf, size_t len) | |||
| 222 | struct timespec ts; | 222 | struct timespec ts; |
| 223 | struct timeval tv; | 223 | struct timeval tv; |
| 224 | perfstat_cpu_total_t cpustats; | 224 | perfstat_cpu_total_t cpustats; |
| 225 | #ifdef _AIX61 | ||
| 225 | perfstat_cpu_total_wpar_t cpustats_wpar; | 226 | perfstat_cpu_total_wpar_t cpustats_wpar; |
| 227 | #endif | ||
| 226 | perfstat_partition_total_t lparstats; | 228 | perfstat_partition_total_t lparstats; |
| 227 | perfstat_disk_total_t diskinfo; | 229 | perfstat_disk_total_t diskinfo; |
| 228 | perfstat_netinterface_total_t netinfo; | 230 | perfstat_netinterface_total_t netinfo; |
| @@ -257,8 +259,10 @@ getentropy_fallback(void *buf, size_t len) | |||
| 257 | HX(perfstat_cpu_total(NULL, &cpustats, | 259 | HX(perfstat_cpu_total(NULL, &cpustats, |
| 258 | sizeof(cpustats), 1) == -1, cpustats); | 260 | sizeof(cpustats), 1) == -1, cpustats); |
| 259 | 261 | ||
| 262 | #ifdef _AIX61 | ||
| 260 | HX(perfstat_cpu_total_wpar(NULL, &cpustats_wpar, | 263 | HX(perfstat_cpu_total_wpar(NULL, &cpustats_wpar, |
| 261 | sizeof(cpustats_wpar), 1) == -1, cpustats_wpar); | 264 | sizeof(cpustats_wpar), 1) == -1, cpustats_wpar); |
| 265 | #endif | ||
| 262 | 266 | ||
| 263 | HX(perfstat_partition_total(NULL, &lparstats, | 267 | HX(perfstat_partition_total(NULL, &lparstats, |
| 264 | sizeof(lparstats), 1) == -1, lparstats); | 268 | sizeof(lparstats), 1) == -1, lparstats); |
