Page MenuHomeFreeBSD
Differential D16493

Move blacklistd.conf to usr.sbin/blacklistd/
ClosedPublic
Actions

Authored by brd on Jul 29 2018, 1:06 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 22, 4:02 PM
Unknown Object (File)
Tue, Mar 18, 2:39 PM
Unknown Object (File)
Mon, Mar 17, 7:31 AM
Unknown Object (File)
Fri, Mar 14, 1:02 PM
Unknown Object (File)
Thu, Mar 13, 9:37 AM
Unknown Object (File)
Mon, Mar 10, 5:09 AM
Unknown Object (File)
Jan 4 2025, 9:15 AM
Unknown Object (File)
Dec 24 2024, 8:45 AM
View All 84 Files
Subscribers
imp

Details

Reviewers
will
bapt
Commits
rS336977: Move blacklistd.conf to usr.sbin/blacklistd/
Summary

Also run: svn mv etc/blacklistd.conf usr.sbin/blacklistd/

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
head/
etc/
4 lines
17 lines
usr.sbin/
blacklistd/
1 line
17 lines

Diff 46076

View Options

head/etc/Makefile

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
#include <crypto/openssl/ossl_cipher.h> #include <crypto/openssl/ossl_cipher.h>
/* /*
* See OPENSSL_ia32cap(3). * See OPENSSL_ia32cap(3).
* *
* [0] = cpu_feature but with a few custom bits * [0] = cpu_feature but with a few custom bits
* [1] = cpu_feature2 but with AMD XOP in bit 11 * [1] = cpu_feature2 but with AMD XOP in bit 11
* [2] = cpu_stdext_feature * [2] = cpu_stdext_feature
* [3] = 0 * [3] = cpu_stdext_feature2
*/ */
unsigned int OPENSSL_ia32cap_P[4]; unsigned int OPENSSL_ia32cap_P[4];
#define AESNI_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(57-32))) #define AESNI_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(57-32)))
ossl_cipher_setkey_t aesni_set_encrypt_key; ossl_cipher_setkey_t aesni_set_encrypt_key;
ossl_cipher_setkey_t aesni_set_decrypt_key; ossl_cipher_setkey_t aesni_set_decrypt_key;
void void
▲ Show 20 Lines • Show All 53 Lines • ▼ Show 20 Lines if ((xcr0 & (XFEATURE_AVX512 | XFEATURE_AVX)) !=
(XFEATURE_AVX512 | XFEATURE_AVX)) (XFEATURE_AVX512 | XFEATURE_AVX))
OPENSSL_ia32cap_P[2] &= ~(CPUID_STDEXT_AVX512VL | OPENSSL_ia32cap_P[2] &= ~(CPUID_STDEXT_AVX512VL |
CPUID_STDEXT_AVX512BW | CPUID_STDEXT_AVX512IFMA | CPUID_STDEXT_AVX512BW | CPUID_STDEXT_AVX512IFMA |
CPUID_STDEXT_AVX512F); CPUID_STDEXT_AVX512F);
if ((xcr0 & XFEATURE_AVX) != XFEATURE_AVX) { if ((xcr0 & XFEATURE_AVX) != XFEATURE_AVX) {
OPENSSL_ia32cap_P[1] &= ~(CPUID2_AVX | AMDID2_XOP | CPUID2_FMA); OPENSSL_ia32cap_P[1] &= ~(CPUID2_AVX | AMDID2_XOP | CPUID2_FMA);
OPENSSL_ia32cap_P[2] &= ~CPUID_STDEXT_AVX2; OPENSSL_ia32cap_P[2] &= ~CPUID_STDEXT_AVX2;
} }
OPENSSL_ia32cap_P[3] = cpu_stdext_feature2;
if (!AESNI_CAPABLE) { if (!AESNI_CAPABLE) {
sc->has_aes = false; sc->has_aes = false;
return; return;
} }
sc->has_aes = true; sc->has_aes = true;
ossl_cipher_aes_cbc.set_encrypt_key = aesni_set_encrypt_key; ossl_cipher_aes_cbc.set_encrypt_key = aesni_set_encrypt_key;
ossl_cipher_aes_cbc.set_decrypt_key = aesni_set_decrypt_key; ossl_cipher_aes_cbc.set_decrypt_key = aesni_set_decrypt_key;
} }
View Options

head/etc/blacklistd.conf

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
#include <crypto/openssl/ossl_cipher.h> #include <crypto/openssl/ossl_cipher.h>
/* /*
* See OPENSSL_ia32cap(3). * See OPENSSL_ia32cap(3).
* *
* [0] = cpu_feature but with a few custom bits * [0] = cpu_feature but with a few custom bits
* [1] = cpu_feature2 but with AMD XOP in bit 11 * [1] = cpu_feature2 but with AMD XOP in bit 11
* [2] = cpu_stdext_feature * [2] = cpu_stdext_feature
* [3] = 0 * [3] = cpu_stdext_feature2
*/ */
unsigned int OPENSSL_ia32cap_P[4]; unsigned int OPENSSL_ia32cap_P[4];
#define AESNI_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(57-32))) #define AESNI_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(57-32)))
ossl_cipher_setkey_t aesni_set_encrypt_key; ossl_cipher_setkey_t aesni_set_encrypt_key;
ossl_cipher_setkey_t aesni_set_decrypt_key; ossl_cipher_setkey_t aesni_set_decrypt_key;
void void
▲ Show 20 Lines • Show All 53 Lines • ▼ Show 20 Lines if ((xcr0 & (XFEATURE_AVX512 | XFEATURE_AVX)) !=
(XFEATURE_AVX512 | XFEATURE_AVX)) (XFEATURE_AVX512 | XFEATURE_AVX))
OPENSSL_ia32cap_P[2] &= ~(CPUID_STDEXT_AVX512VL | OPENSSL_ia32cap_P[2] &= ~(CPUID_STDEXT_AVX512VL |
CPUID_STDEXT_AVX512BW | CPUID_STDEXT_AVX512IFMA | CPUID_STDEXT_AVX512BW | CPUID_STDEXT_AVX512IFMA |
CPUID_STDEXT_AVX512F); CPUID_STDEXT_AVX512F);
if ((xcr0 & XFEATURE_AVX) != XFEATURE_AVX) { if ((xcr0 & XFEATURE_AVX) != XFEATURE_AVX) {
OPENSSL_ia32cap_P[1] &= ~(CPUID2_AVX | AMDID2_XOP | CPUID2_FMA); OPENSSL_ia32cap_P[1] &= ~(CPUID2_AVX | AMDID2_XOP | CPUID2_FMA);
OPENSSL_ia32cap_P[2] &= ~CPUID_STDEXT_AVX2; OPENSSL_ia32cap_P[2] &= ~CPUID_STDEXT_AVX2;
} }
OPENSSL_ia32cap_P[3] = cpu_stdext_feature2;
if (!AESNI_CAPABLE) { if (!AESNI_CAPABLE) {
sc->has_aes = false; sc->has_aes = false;
return; return;
} }
sc->has_aes = true; sc->has_aes = true;
ossl_cipher_aes_cbc.set_encrypt_key = aesni_set_encrypt_key; ossl_cipher_aes_cbc.set_encrypt_key = aesni_set_encrypt_key;
ossl_cipher_aes_cbc.set_decrypt_key = aesni_set_decrypt_key; ossl_cipher_aes_cbc.set_decrypt_key = aesni_set_decrypt_key;
} }
View Options

head/usr.sbin/blacklistd/Makefile

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
#include <crypto/openssl/ossl_cipher.h> #include <crypto/openssl/ossl_cipher.h>
/* /*
* See OPENSSL_ia32cap(3). * See OPENSSL_ia32cap(3).
* *
* [0] = cpu_feature but with a few custom bits * [0] = cpu_feature but with a few custom bits
* [1] = cpu_feature2 but with AMD XOP in bit 11 * [1] = cpu_feature2 but with AMD XOP in bit 11
* [2] = cpu_stdext_feature * [2] = cpu_stdext_feature
* [3] = 0 * [3] = cpu_stdext_feature2
*/ */
unsigned int OPENSSL_ia32cap_P[4]; unsigned int OPENSSL_ia32cap_P[4];
#define AESNI_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(57-32))) #define AESNI_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(57-32)))
ossl_cipher_setkey_t aesni_set_encrypt_key; ossl_cipher_setkey_t aesni_set_encrypt_key;
ossl_cipher_setkey_t aesni_set_decrypt_key; ossl_cipher_setkey_t aesni_set_decrypt_key;
void void
▲ Show 20 Lines • Show All 53 Lines • ▼ Show 20 Lines if ((xcr0 & (XFEATURE_AVX512 | XFEATURE_AVX)) !=
(XFEATURE_AVX512 | XFEATURE_AVX)) (XFEATURE_AVX512 | XFEATURE_AVX))
OPENSSL_ia32cap_P[2] &= ~(CPUID_STDEXT_AVX512VL | OPENSSL_ia32cap_P[2] &= ~(CPUID_STDEXT_AVX512VL |
CPUID_STDEXT_AVX512BW | CPUID_STDEXT_AVX512IFMA | CPUID_STDEXT_AVX512BW | CPUID_STDEXT_AVX512IFMA |
CPUID_STDEXT_AVX512F); CPUID_STDEXT_AVX512F);
if ((xcr0 & XFEATURE_AVX) != XFEATURE_AVX) { if ((xcr0 & XFEATURE_AVX) != XFEATURE_AVX) {
OPENSSL_ia32cap_P[1] &= ~(CPUID2_AVX | AMDID2_XOP | CPUID2_FMA); OPENSSL_ia32cap_P[1] &= ~(CPUID2_AVX | AMDID2_XOP | CPUID2_FMA);
OPENSSL_ia32cap_P[2] &= ~CPUID_STDEXT_AVX2; OPENSSL_ia32cap_P[2] &= ~CPUID_STDEXT_AVX2;
} }
OPENSSL_ia32cap_P[3] = cpu_stdext_feature2;
if (!AESNI_CAPABLE) { if (!AESNI_CAPABLE) {
sc->has_aes = false; sc->has_aes = false;
return; return;
} }
sc->has_aes = true; sc->has_aes = true;
ossl_cipher_aes_cbc.set_encrypt_key = aesni_set_encrypt_key; ossl_cipher_aes_cbc.set_encrypt_key = aesni_set_encrypt_key;
ossl_cipher_aes_cbc.set_decrypt_key = aesni_set_decrypt_key; ossl_cipher_aes_cbc.set_decrypt_key = aesni_set_decrypt_key;
} }
View Options

head/usr.sbin/blacklistd/blacklistd.conf

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
#include <crypto/openssl/ossl_cipher.h> #include <crypto/openssl/ossl_cipher.h>
/* /*
* See OPENSSL_ia32cap(3). * See OPENSSL_ia32cap(3).
* *
* [0] = cpu_feature but with a few custom bits * [0] = cpu_feature but with a few custom bits
* [1] = cpu_feature2 but with AMD XOP in bit 11 * [1] = cpu_feature2 but with AMD XOP in bit 11
* [2] = cpu_stdext_feature * [2] = cpu_stdext_feature
* [3] = 0 * [3] = cpu_stdext_feature2
*/ */
unsigned int OPENSSL_ia32cap_P[4]; unsigned int OPENSSL_ia32cap_P[4];
#define AESNI_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(57-32))) #define AESNI_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(57-32)))
ossl_cipher_setkey_t aesni_set_encrypt_key; ossl_cipher_setkey_t aesni_set_encrypt_key;
ossl_cipher_setkey_t aesni_set_decrypt_key; ossl_cipher_setkey_t aesni_set_decrypt_key;
void void
▲ Show 20 Lines • Show All 53 Lines • ▼ Show 20 Lines if ((xcr0 & (XFEATURE_AVX512 | XFEATURE_AVX)) !=
(XFEATURE_AVX512 | XFEATURE_AVX)) (XFEATURE_AVX512 | XFEATURE_AVX))
OPENSSL_ia32cap_P[2] &= ~(CPUID_STDEXT_AVX512VL | OPENSSL_ia32cap_P[2] &= ~(CPUID_STDEXT_AVX512VL |
CPUID_STDEXT_AVX512BW | CPUID_STDEXT_AVX512IFMA | CPUID_STDEXT_AVX512BW | CPUID_STDEXT_AVX512IFMA |
CPUID_STDEXT_AVX512F); CPUID_STDEXT_AVX512F);
if ((xcr0 & XFEATURE_AVX) != XFEATURE_AVX) { if ((xcr0 & XFEATURE_AVX) != XFEATURE_AVX) {
OPENSSL_ia32cap_P[1] &= ~(CPUID2_AVX | AMDID2_XOP | CPUID2_FMA); OPENSSL_ia32cap_P[1] &= ~(CPUID2_AVX | AMDID2_XOP | CPUID2_FMA);
OPENSSL_ia32cap_P[2] &= ~CPUID_STDEXT_AVX2; OPENSSL_ia32cap_P[2] &= ~CPUID_STDEXT_AVX2;
} }
OPENSSL_ia32cap_P[3] = cpu_stdext_feature2;
if (!AESNI_CAPABLE) { if (!AESNI_CAPABLE) {
sc->has_aes = false; sc->has_aes = false;
return; return;
} }
sc->has_aes = true; sc->has_aes = true;
ossl_cipher_aes_cbc.set_encrypt_key = aesni_set_encrypt_key; ossl_cipher_aes_cbc.set_encrypt_key = aesni_set_encrypt_key;
ossl_cipher_aes_cbc.set_decrypt_key = aesni_set_decrypt_key; ossl_cipher_aes_cbc.set_decrypt_key = aesni_set_decrypt_key;
} }