Merge "EntropyMixer: ensure new seed file is as good as old one" am:... (5a06abe6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/EntropyMixer.java

+172 −83

Original line number	Diff line number	Diff line
		@@ -25,41 +25,63 @@ import android.os.Environment;
		import android.os.Handler;
		import android.os.Message;
		import android.os.SystemProperties;
		import android.util.AtomicFile;
		import android.util.Slog;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.Preconditions;

		import java.io.File;
		import java.io.FileInputStream;
		import java.io.FileNotFoundException;
		import java.io.FileOutputStream;
		import java.io.IOException;
		import java.io.PrintWriter;
		import java.nio.ByteBuffer;
		import java.security.MessageDigest;
		import java.security.NoSuchAlgorithmException;

		/**
		* A service designed to load and periodically save "randomness"
		* for the Linux kernel RNG.
		*
		* <p>When a Linux system starts up, the entropy pool associated with
		* {@code /dev/random} may be in a fairly predictable state. Applications which
		* depend strongly on randomness may find {@code /dev/random} or
		* {@code /dev/urandom} returning predictable data. In order to counteract
		* this effect, it's helpful to carry the entropy pool information across
		* shutdowns and startups.
		* A service that loads and periodically saves "randomness" for the
		* Linux kernel RNG.
		*
		* <p>This class was modeled after the script in the
		* <a href="https://man7.org/linux/man-pages/man4/random.4.html">
		* random(4) manual page</a>.
		* <p>When a Linux system starts up, the entropy pool associated with {@code
		* /dev/urandom}, {@code /dev/random}, and {@code getrandom()} may be in a
		* fairly predictable state, depending on the entropy sources available to the
		* kernel. Applications that depend on randomness may find these APIs returning
		* predictable data. To counteract this effect, this service maintains a seed
		* file across shutdowns and startups, and also mixes some device and
		* boot-specific information into the pool.
		*/
		public class EntropyMixer extends Binder {
		private static final String TAG = "EntropyMixer";
		private static final int ENTROPY_WHAT = 1;
		private static final int ENTROPY_WRITE_PERIOD = 3 * 60 * 60 * 1000; // 3 hrs
		private static final int UPDATE_SEED_MSG = 1;
		private static final int SEED_UPDATE_PERIOD = 3 * 60 * 60 * 1000; // 3 hrs
		private static final long START_TIME = System.currentTimeMillis();
		private static final long START_NANOTIME = System.nanoTime();

		private final String randomDevice;
		private final String entropyFile;
		/*
		* The size of the seed file in bytes. This must be at least the size of a
		* SHA-256 digest (32 bytes). It should also be at least the size of the
		* kernel's entropy pool (/proc/sys/kernel/random/poolsize divided by 8),
		* which historically was 512 bytes, but changed to 32 bytes in Linux v5.18.
		* There's actually no real need for more than a 32-byte seed, even with
		* older kernels; however, we take the conservative approach of staying with
		* the 512-byte size for now, as the cost is very small.
		*/
		@VisibleForTesting
		static final int SEED_FILE_SIZE = 512;

		@VisibleForTesting
		static final String DEVICE_SPECIFIC_INFO_HEADER =
		"Copyright (C) 2009 The Android Open Source Project\n" +
		"All Your Randomness Are Belong To Us\n";

		private final AtomicFile seedFile;
		private final File randomReadDevice;
		private final File randomWriteDevice; // separate from randomReadDevice only for testing

		/**
		* Handler that periodically updates the entropy on disk.
		* Handler that periodically updates the seed file.
		*/
		private final Handler mHandler = new Handler(IoThread.getHandler().getLooper()) {
		// IMPLEMENTATION NOTE: This handler runs on the I/O thread to avoid I/O on the main thread.
		@@ -67,40 +89,36 @@ public class EntropyMixer extends Binder {
		// own ID space for the "what" parameter of messages seen by the handler.
		@Override
		public void handleMessage(Message msg) {
		if (msg.what != ENTROPY_WHAT) {
		if (msg.what != UPDATE_SEED_MSG) {
		Slog.e(TAG, "Will not process invalid message");
		return;
		}
		writeEntropy();
		scheduleEntropyWriter();
		updateSeedFile();
		scheduleSeedUpdater();
		}
		};

		private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		writeEntropy();
		updateSeedFile();
		}
		};

		public EntropyMixer(Context context) {
		this(context, getSystemDir() + "/entropy.dat", "/dev/urandom");
		this(context, new File(getSystemDir(), "entropy.dat"),
		new File("/dev/urandom"), new File("/dev/urandom"));
		}

		/** Test only interface, not for public use */
		public EntropyMixer(
		Context context,
		String entropyFile,
		String randomDevice) {
		if (randomDevice == null) { throw new NullPointerException("randomDevice"); }
		if (entropyFile == null) { throw new NullPointerException("entropyFile"); }
		@VisibleForTesting
		EntropyMixer(Context context, File seedFile, File randomReadDevice, File randomWriteDevice) {
		this.seedFile = new AtomicFile(Preconditions.checkNotNull(seedFile));
		this.randomReadDevice = Preconditions.checkNotNull(randomReadDevice);
		this.randomWriteDevice = Preconditions.checkNotNull(randomWriteDevice);

		this.randomDevice = randomDevice;
		this.entropyFile = entropyFile;
		loadInitialEntropy();
		addDeviceSpecificEntropy();
		writeEntropy();
		scheduleEntropyWriter();
		updateSeedFile();
		scheduleSeedUpdater();
		IntentFilter broadcastFilter = new IntentFilter(Intent.ACTION_SHUTDOWN);
		broadcastFilter.addAction(Intent.ACTION_POWER_CONNECTED);
		broadcastFilter.addAction(Intent.ACTION_REBOOT);
		@@ -112,76 +130,147 @@ public class EntropyMixer extends Binder {
		);
		}

		private void scheduleEntropyWriter() {
		mHandler.removeMessages(ENTROPY_WHAT);
		mHandler.sendEmptyMessageDelayed(ENTROPY_WHAT, ENTROPY_WRITE_PERIOD);
		private void scheduleSeedUpdater() {
		mHandler.removeMessages(UPDATE_SEED_MSG);
		mHandler.sendEmptyMessageDelayed(UPDATE_SEED_MSG, SEED_UPDATE_PERIOD);
		}

		private void loadInitialEntropy() {
		try {
		RandomBlock.fromFile(entropyFile).toFile(randomDevice, false);
		} catch (FileNotFoundException e) {
		Slog.w(TAG, "No existing entropy file -- first boot?");
		byte[] seed = readSeedFile();
		try (FileOutputStream out = new FileOutputStream(randomWriteDevice)) {
		if (seed.length != 0) {
		out.write(seed);
		Slog.i(TAG, "Loaded existing seed file");
		}
		out.write(getDeviceSpecificInformation());
		} catch (IOException e) {
		Slog.w(TAG, "Failure loading existing entropy file", e);
		Slog.e(TAG, "Error writing to " + randomWriteDevice, e);
		}
		}

		private void writeEntropy() {
		private byte[] readSeedFile() {
		try {
		Slog.i(TAG, "Writing entropy...");
		RandomBlock.fromFile(randomDevice).toFile(entropyFile, true);
		return seedFile.readFully();
		} catch (FileNotFoundException e) {
		return new byte[0];
		} catch (IOException e) {
		Slog.w(TAG, "Unable to write entropy", e);
		Slog.e(TAG, "Error reading " + seedFile.getBaseFile(), e);
		return new byte[0];
		}
		}

		/**
		* Add additional information to the kernel entropy pool. The
		* information isn't necessarily "random", but that's ok. Even
		* sending non-random information to {@code /dev/urandom} is useful
		* because, while it doesn't increase the "quality" of the entropy pool,
		* it mixes more bits into the pool, which gives us a higher degree
		* of uncertainty in the generated randomness. Like nature, writes to
		* the random device can only cause the quality of the entropy in the
		* kernel to stay the same or increase.
		* Update (or create) the seed file.
		*
		* <p>For maximum effect, we try to target information which varies
		* on a per-device basis, and is not easily observable to an
		* attacker.
		* <p>Traditionally, the recommended way to update a seed file on Linux was
		* to simply copy some bytes from /dev/urandom. However, that isn't
		* actually a good way to do it, because writes to /dev/urandom aren't
		* guaranteed to immediately affect reads from /dev/urandom. This can cause
		* the new seed file to contain less entropy than the old one!
		*
		* <p>Instead, we generate the new seed by hashing the old seed together
		* with some bytes from /dev/urandom, following the example of <a
		* href="https://git.zx2c4.com/seedrng/tree/README.md">SeedRNG</a>. This
		* ensures that the new seed is at least as entropic as the old seed.
		*/
		private void addDeviceSpecificEntropy() {
		PrintWriter out = null;
		private void updateSeedFile() {
		byte[] oldSeed = readSeedFile();
		byte[] newSeed = new byte[SEED_FILE_SIZE];

		try (FileInputStream in = new FileInputStream(randomReadDevice)) {
		if (in.read(newSeed) != newSeed.length) {
		throw new IOException("unexpected EOF");
		}
		} catch (IOException e) {
		Slog.e(TAG, "Error reading " + randomReadDevice +
		"; seed file won't be properly updated", e);
		// Continue on; at least we'll have new timestamps...
		}

		// newSeed = newSeed[:-32] \|\|
		// SHA-256(fixed_prefix \|\| real_time \|\| boot_time \|\|
		// old_seed_len \|\| old_seed \|\| new_seed_len \|\| new_seed)
		MessageDigest sha256;
		try {
		sha256 = MessageDigest.getInstance("SHA-256");
		} catch (NoSuchAlgorithmException e) {
		Slog.wtf(TAG, "SHA-256 algorithm not found; seed file won't be updated", e);
		return;
		}
		// This fixed prefix should be changed if the fields that are hashed change.
		sha256.update("Android EntropyMixer v1".getBytes());
		sha256.update(longToBytes(System.currentTimeMillis()));
		sha256.update(longToBytes(System.nanoTime()));
		sha256.update(longToBytes(oldSeed.length));
		sha256.update(oldSeed);
		sha256.update(longToBytes(newSeed.length));
		sha256.update(newSeed);
		byte[] digest = sha256.digest();
		System.arraycopy(digest, 0, newSeed, newSeed.length - digest.length, digest.length);

		writeNewSeed(newSeed);
		if (oldSeed.length == 0) {
		Slog.i(TAG, "Created seed file");
		} else {
		Slog.i(TAG, "Updated seed file");
		}
		}

		private void writeNewSeed(byte[] newSeed) {
		FileOutputStream out = null;
		try {
		out = new PrintWriter(new FileOutputStream(randomDevice));
		out.println("Copyright (C) 2009 The Android Open Source Project");
		out.println("All Your Randomness Are Belong To Us");
		out.println(START_TIME);
		out.println(START_NANOTIME);
		out.println(SystemProperties.get("ro.serialno"));
		out.println(SystemProperties.get("ro.bootmode"));
		out.println(SystemProperties.get("ro.baseband"));
		out.println(SystemProperties.get("ro.carrier"));
		out.println(SystemProperties.get("ro.bootloader"));
		out.println(SystemProperties.get("ro.hardware"));
		out.println(SystemProperties.get("ro.revision"));
		out.println(SystemProperties.get("ro.build.fingerprint"));
		out.println(new Object().hashCode());
		out.println(System.currentTimeMillis());
		out.println(System.nanoTime());
		out = seedFile.startWrite();
		out.write(newSeed);
		seedFile.finishWrite(out);
		} catch (IOException e) {
		Slog.w(TAG, "Unable to add device specific data to the entropy pool", e);
		} finally {
		if (out != null) {
		out.close();
		Slog.e(TAG, "Error writing " + seedFile.getBaseFile(), e);
		seedFile.failWrite(out);
		}
		}

		private static byte[] longToBytes(long x) {
		ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);
		buffer.putLong(x);
		return buffer.array();
		}

		/**
		* Get some device and boot-specific information to mix into the kernel's
		* entropy pool. This information probably won't contain much actual
		* entropy, but that's fine because we don't ask the kernel to credit it.
		* Writes to {@code /dev/urandom} can only increase or have no effect on the
		* quality of random numbers, never decrease it.
		*
		* <p>The main goal here is just to initialize the entropy pool differently
		* on devices that might otherwise be identical and have very little other
		* entropy available. Therefore, we include various system properties that
		* can vary on a per-device and/or per-build basis. We also include some
		* timestamps, as these might vary on a per-boot basis and be not easily
		* observable or guessable by an attacker.
		*/
		private byte[] getDeviceSpecificInformation() {
		StringBuilder b = new StringBuilder();
		b.append(DEVICE_SPECIFIC_INFO_HEADER);
		b.append(START_TIME).append('\n');
		b.append(START_NANOTIME).append('\n');
		b.append(SystemProperties.get("ro.serialno")).append('\n');
		b.append(SystemProperties.get("ro.bootmode")).append('\n');
		b.append(SystemProperties.get("ro.baseband")).append('\n');
		b.append(SystemProperties.get("ro.carrier")).append('\n');
		b.append(SystemProperties.get("ro.bootloader")).append('\n');
		b.append(SystemProperties.get("ro.hardware")).append('\n');
		b.append(SystemProperties.get("ro.revision")).append('\n');
		b.append(SystemProperties.get("ro.build.fingerprint")).append('\n');
		b.append(new Object().hashCode()).append('\n');
		b.append(System.currentTimeMillis()).append('\n');
		b.append(System.nanoTime()).append('\n');
		return b.toString().getBytes();
		}

		private static String getSystemDir() {
		private static File getSystemDir() {
		File dataDir = Environment.getDataDirectory();
		File systemDir = new File(dataDir, "system");
		systemDir.mkdirs();
		return systemDir.toString();
		return systemDir;
		}
		}

services/core/java/com/android/server/RandomBlock.java

deleted100644 → 0

+0 −101

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server;

		import android.util.Slog;

		import java.io.Closeable;
		import java.io.DataOutput;
		import java.io.EOFException;
		import java.io.FileInputStream;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.RandomAccessFile;

		/**
		* A block of 512 random {@code byte}s.
		*/
		class RandomBlock {

		private static final String TAG = "RandomBlock";
		private static final boolean DEBUG = false;
		private static final int BLOCK_SIZE = 512;
		private byte[] block = new byte[BLOCK_SIZE];

		private RandomBlock() { }

		static RandomBlock fromFile(String filename) throws IOException {
		if (DEBUG) Slog.v(TAG, "reading from file " + filename);
		InputStream stream = null;
		try {
		stream = new FileInputStream(filename);
		return fromStream(stream);
		} finally {
		close(stream);
		}
		}

		private static RandomBlock fromStream(InputStream in) throws IOException {
		RandomBlock retval = new RandomBlock();
		int total = 0;
		while(total < BLOCK_SIZE) {
		int result = in.read(retval.block, total, BLOCK_SIZE - total);
		if (result == -1) {
		throw new EOFException();
		}
		total += result;
		}
		return retval;
		}

		void toFile(String filename, boolean sync) throws IOException {
		if (DEBUG) Slog.v(TAG, "writing to file " + filename);
		RandomAccessFile out = null;
		try {
		out = new RandomAccessFile(filename, sync ? "rws" : "rw");
		toDataOut(out);
		truncateIfPossible(out);
		} finally {
		close(out);
		}
		}

		private static void truncateIfPossible(RandomAccessFile f) {
		try {
		f.setLength(BLOCK_SIZE);
		} catch (IOException e) {
		// ignore this exception. Sometimes, the file we're trying to
		// write is a character device, such as /dev/urandom, and
		// these character devices do not support setting the length.
		}
		}

		private void toDataOut(DataOutput out) throws IOException {
		out.write(block);
		}

		private static void close(Closeable c) {
		try {
		if (c == null) {
		return;
		}
		c.close();
		} catch (IOException e) {
		Slog.w(TAG, "IOException thrown while closing Closeable", e);
		}
		}
		}

services/tests/servicestests/src/com/android/server/EntropyMixerTest.java

+98 −8

Original line number	Diff line number	Diff line
		@@ -16,26 +16,116 @@

		package com.android.server;

		import static org.junit.Assert.assertArrayEquals;

		import android.content.Context;
		import android.os.FileUtils;
		import android.test.AndroidTestCase;

		import org.junit.Test;

		import java.io.File;
		import java.nio.file.Files;
		import java.util.Arrays;

		/**
		* Tests for {@link com.android.server.EntropyMixer}
		*/
		public class EntropyMixerTest extends AndroidTestCase {

		public void testInitialWrite() throws Exception {
		File dir = getContext().getDir("testInitialWrite", Context.MODE_PRIVATE);
		File file = File.createTempFile("testInitialWrite", "dat", dir);
		private static final int SEED_FILE_SIZE = EntropyMixer.SEED_FILE_SIZE;

		private File dir;
		private File seedFile;
		private File randomReadDevice;
		private File randomWriteDevice;

		@Override
		public void setUp() throws Exception {
		dir = getContext().getDir("test", Context.MODE_PRIVATE);
		seedFile = createTempFile(dir, "entropy.dat");
		randomReadDevice = createTempFile(dir, "urandomRead");
		randomWriteDevice = createTempFile(dir, "urandomWrite");
		}

		private File createTempFile(File dir, String prefix) throws Exception {
		File file = File.createTempFile(prefix, null, dir);
		file.deleteOnExit();
		assertEquals(0, FileUtils.readTextFile(file, 0, null).length());
		return file;
		}

		private byte[] repeatByte(byte b, int length) {
		byte[] data = new byte[length];
		Arrays.fill(data, b);
		return data;
		}

		// Test initializing the EntropyMixer when the seed file doesn't exist yet.
		@Test
		public void testInitFirstBoot() throws Exception {
		seedFile.delete();

		byte[] urandomInjectedData = repeatByte((byte) 0x01, SEED_FILE_SIZE);
		Files.write(randomReadDevice.toPath(), urandomInjectedData);

		// The constructor has the side effect of writing to file
		new EntropyMixer(getContext(), "/dev/null", file.getCanonicalPath());
		// The constructor should have the side effect of writing to
		// randomWriteDevice and creating seedFile.
		new EntropyMixer(getContext(), seedFile, randomReadDevice, randomWriteDevice);

		// Since there was no old seed file, the data that was written to
		// randomWriteDevice should contain only device-specific information.
		assertTrue(isDeviceSpecificInfo(Files.readAllBytes(randomWriteDevice.toPath())));

		// The seed file should have been created.
		validateSeedFile(seedFile, new byte[0], urandomInjectedData);
		}

		// Test initializing the EntropyMixer when the seed file already exists.
		@Test
		public void testInitNonFirstBoot() throws Exception {
		byte[] previousSeed = repeatByte((byte) 0x01, SEED_FILE_SIZE);
		Files.write(seedFile.toPath(), previousSeed);

		byte[] urandomInjectedData = repeatByte((byte) 0x02, SEED_FILE_SIZE);
		Files.write(randomReadDevice.toPath(), urandomInjectedData);

		// The constructor should have the side effect of writing to
		// randomWriteDevice and updating seedFile.
		new EntropyMixer(getContext(), seedFile, randomReadDevice, randomWriteDevice);

		// The data that was written to randomWriteDevice should consist of the
		// previous seed followed by the device-specific information.
		byte[] dataWrittenToUrandom = Files.readAllBytes(randomWriteDevice.toPath());
		byte[] firstPartWritten = Arrays.copyOf(dataWrittenToUrandom, SEED_FILE_SIZE);
		byte[] secondPartWritten =
		Arrays.copyOfRange(
		dataWrittenToUrandom, SEED_FILE_SIZE, dataWrittenToUrandom.length);
		assertArrayEquals(previousSeed, firstPartWritten);
		assertTrue(isDeviceSpecificInfo(secondPartWritten));

		// The seed file should have been updated.
		validateSeedFile(seedFile, previousSeed, urandomInjectedData);
		}

		private boolean isDeviceSpecificInfo(byte[] data) {
		return new String(data).startsWith(EntropyMixer.DEVICE_SPECIFIC_INFO_HEADER);
		}

		assertTrue(FileUtils.readTextFile(file, 0, null).length() > 0);
		private void validateSeedFile(File seedFile, byte[] previousSeed, byte[] urandomInjectedData)
		throws Exception {
		final int unhashedLen = SEED_FILE_SIZE - 32;
		byte[] newSeed = Files.readAllBytes(seedFile.toPath());
		assertEquals(SEED_FILE_SIZE, newSeed.length);
		assertEquals(SEED_FILE_SIZE, urandomInjectedData.length);
		assertFalse(Arrays.equals(newSeed, previousSeed));
		// The new seed should consist of the first SEED_FILE_SIZE - 32 bytes
		// that were read from urandom, followed by a 32-byte hash that should
		// not be the same as the last 32 bytes that were read from urandom.
		byte[] firstPart = Arrays.copyOf(newSeed, unhashedLen);
		byte[] secondPart = Arrays.copyOfRange(newSeed, unhashedLen, SEED_FILE_SIZE);
		byte[] firstPartInjected = Arrays.copyOf(urandomInjectedData, unhashedLen);
		byte[] secondPartInjected =
		Arrays.copyOfRange(urandomInjectedData, unhashedLen, SEED_FILE_SIZE);
		assertArrayEquals(firstPart, firstPartInjected);
		assertFalse(Arrays.equals(secondPart, secondPartInjected));
		}
		}