move generate_uuid from mkswap to libbb

Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
author: Vladimir Dronnikov <dronnikov@gmail.com> 2009-10-15 09:24:25 +0200
committer: Denys Vlasenko <vda.linux@googlemail.com> 2009-10-15 09:24:25 +0200
commit: db67a20595be279e7db9f5f8e27bd94534efb8d4 (patch)
tree: 0263d0ac18ff70781d9a3074f12f5abcd2e18dfc /util-linux
parent: 7eabffafa5b6faaaa87ff8ba0efbf637aaa364e8 (diff)
download: busybox-w32-db67a20595be279e7db9f5f8e27bd94534efb8d4.tar.gz
busybox-w32-db67a20595be279e7db9f5f8e27bd94534efb8d4.tar.bz2
busybox-w32-db67a20595be279e7db9f5f8e27bd94534efb8d4.zip
1 files changed, 13 insertions, 79 deletions
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index f71884340..226831bba 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -50,84 +50,6 @@ static void mkswap_selinux_setcontext(int fd, const char *path)
 # define mkswap_selinux_setcontext(fd, path) ((void)0)
 #endif
-#if ENABLE_FEATURE_MKSWAP_UUID
-static void mkswap_generate_uuid(uint8_t *buf)
-{
-        /* http://www.ietf.org/rfc/rfc4122.txt
-         *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         * |                          time_low                             |
-         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         * |       time_mid                |         time_hi_and_version   |
-         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         * |clk_seq_and_variant            |         node (0-1)            |
-         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         * |                         node (2-5)                            |
-         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         * IOW, uuid has this layout:
-         * uint32_t time_low (big endian)
-         * uint16_t time_mid (big endian)
-         * uint16_t time_hi_and_version (big endian)
-         *  version is a 4-bit field:
-         *   1 Time-based
-         *   2 DCE Security, with embedded POSIX UIDs
-         *   3 Name-based (MD5)
-         *   4 Randomly generated
-         *   5 Name-based (SHA-1)
-         * uint16_t clk_seq_and_variant (big endian)
-         *  variant is a 3-bit field:
-         *   0xx Reserved, NCS backward compatibility
-         *   10x The variant specified in rfc4122
-         *   110 Reserved, Microsoft backward compatibility
-         *   111 Reserved for future definition
-         * uint8_t node[6]
-         *
-         * For version 4, these bits are set/cleared:
-         * time_hi_and_version & 0x0fff | 0x4000
-         * clk_seq_and_variant & 0x3fff | 0x8000
-         */
-        pid_t pid;
-        int i;
-        char uuid_string[32];
-        i = open("/dev/urandom", O_RDONLY);
-        if (i >= 0) {
-                read(i, buf, 16);
-                close(i);
-        }
-        /* Paranoia. /dev/urandom may be missing.
-         * rand() is guaranteed to generate at least [0, 2^15) range,
-         * but lowest bits in some libc are not so "random".  */
-        srand(monotonic_us());
-        pid = getpid();
-        while (1) {
-                for (i = 0; i < 16; i++)
-                        buf[i] ^= rand() >> 5;
-                if (pid == 0)
-                        break;
-                srand(pid);
-                pid = 0;
-        }
-        /* version = 4 */
-        buf[4 + 2    ] = (buf[4 + 2    ] & 0x0f) | 0x40;
-        /* variant = 10x */
-        buf[4 + 2 + 2] = (buf[4 + 2 + 2] & 0x3f) | 0x80;
-        bin2hex(uuid_string, (void*) buf, 16);
-        /* f.e. UUID=dfd9c173-be52-4d27-99a5-c34c6c2ff55f */
-        printf("UUID=%.8s"  "-%.4s-%.4s-%.4s-%.12s\n",
-                uuid_string,
-                uuid_string+8,
-                uuid_string+8+4,
-                uuid_string+8+4+4,
-                uuid_string+8+4+4+4
-        );
-}
-#else
-# define mkswap_generate_uuid(buf) ((void)0)
-#endif
 #if 0 /* from Linux 2.6.23 */
 /*
 * Magic header for a swap area. The first part of the union is
@@ -190,7 +112,19 @@ int mkswap_main(int argc, char **argv)
        // Make a header. hdr is zero-filled so far...
        hdr[0] = 1;
        hdr[1] = (len / pagesize) - 1;
-        mkswap_generate_uuid((void*) &hdr[3]);
+#if ENABLE_FEATURE_MKSWAP_UUID
+        char uuid_string[32];
+        generate_uuid((void*) &hdr[3]);
+        bin2hex(uuid_string, (void*) &hdr[3], 16);
+        /* f.e. UUID=dfd9c173-be52-4d27-99a5-c34c6c2ff55f */
+        printf("UUID=%.8s"  "-%.4s-%.4s-%.4s-%.12s\n",
+                uuid_string,
+                uuid_string+8,
+                uuid_string+8+4,
+                uuid_string+8+4+4,
+                uuid_string+8+4+4+4
+        );
+#endif
        // Write the header.  Sync to disk because some kernel versions check
        // signature on disk (not in cache) during swapon.
author	Vladimir Dronnikov <dronnikov@gmail.com>	2009-10-15 09:24:25 +0200
committer	Denys Vlasenko <vda.linux@googlemail.com>	2009-10-15 09:24:25 +0200
commit	db67a20595be279e7db9f5f8e27bd94534efb8d4 (patch)
tree	0263d0ac18ff70781d9a3074f12f5abcd2e18dfc /util-linux
parent	7eabffafa5b6faaaa87ff8ba0efbf637aaa364e8 (diff)
download	busybox-w32-db67a20595be279e7db9f5f8e27bd94534efb8d4.tar.gz busybox-w32-db67a20595be279e7db9f5f8e27bd94534efb8d4.tar.bz2 busybox-w32-db67a20595be279e7db9f5f8e27bd94534efb8d4.zip

diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c index f71884340..226831bba 100644 --- a/util-linux/mkswap.c +++ b/util-linux/mkswap.c
@@ -50,84 +50,6 @@ static void mkswap_selinux_setcontext(int fd, const char *path)
50	# define mkswap_selinux_setcontext(fd, path) ((void)0)	50	# define mkswap_selinux_setcontext(fd, path) ((void)0)
51	#endif	51	#endif
52		52
53	#if ENABLE_FEATURE_MKSWAP_UUID
54	static void mkswap_generate_uuid(uint8_t *buf)
55	{
56	/* http://www.ietf.org/rfc/rfc4122.txt
57	* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
58	* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
59	* \| time_low \|
60	* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
61	* \| time_mid \| time_hi_and_version \|
62	* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
63	* \|clk_seq_and_variant \| node (0-1) \|
64	* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
65	* \| node (2-5) \|
66	* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
67	* IOW, uuid has this layout:
68	* uint32_t time_low (big endian)
69	* uint16_t time_mid (big endian)
70	* uint16_t time_hi_and_version (big endian)
71	* version is a 4-bit field:
72	* 1 Time-based
73	* 2 DCE Security, with embedded POSIX UIDs
74	* 3 Name-based (MD5)
75	* 4 Randomly generated
76	* 5 Name-based (SHA-1)
77	* uint16_t clk_seq_and_variant (big endian)
78	* variant is a 3-bit field:
79	* 0xx Reserved, NCS backward compatibility
80	* 10x The variant specified in rfc4122
81	* 110 Reserved, Microsoft backward compatibility
82	* 111 Reserved for future definition
83	* uint8_t node[6]
84	*
85	* For version 4, these bits are set/cleared:
86	* time_hi_and_version & 0x0fff \| 0x4000
87	* clk_seq_and_variant & 0x3fff \| 0x8000
88	*/
89	pid_t pid;
90	int i;
91	char uuid_string[32];
92
93	i = open("/dev/urandom", O_RDONLY);
94	if (i >= 0) {
95	read(i, buf, 16);
96	close(i);
97	}
98	/* Paranoia. /dev/urandom may be missing.
99	* rand() is guaranteed to generate at least [0, 2^15) range,
100	* but lowest bits in some libc are not so "random". */
101	srand(monotonic_us());
102	pid = getpid();
103	while (1) {
104	for (i = 0; i < 16; i++)
105	buf[i] ^= rand() >> 5;
106	if (pid == 0)
107	break;
108	srand(pid);
109	pid = 0;
110	}
111
112	/* version = 4 */
113	buf[4 + 2 ] = (buf[4 + 2 ] & 0x0f) \| 0x40;
114	/* variant = 10x */
115	buf[4 + 2 + 2] = (buf[4 + 2 + 2] & 0x3f) \| 0x80;
116
117	bin2hex(uuid_string, (void*) buf, 16);
118	/* f.e. UUID=dfd9c173-be52-4d27-99a5-c34c6c2ff55f */
119	printf("UUID=%.8s" "-%.4s-%.4s-%.4s-%.12s\n",
120	uuid_string,
121	uuid_string+8,
122	uuid_string+8+4,
123	uuid_string+8+4+4,
124	uuid_string+8+4+4+4
125	);
126	}
127	#else
128	# define mkswap_generate_uuid(buf) ((void)0)
129	#endif
130
131	#if 0 /* from Linux 2.6.23 */	53	#if 0 /* from Linux 2.6.23 */
132	/*	54	/*
133	* Magic header for a swap area. The first part of the union is	55	* Magic header for a swap area. The first part of the union is
@@ -190,7 +112,19 @@ int mkswap_main(int argc, char **argv)
190	// Make a header. hdr is zero-filled so far...	112	// Make a header. hdr is zero-filled so far...
191	hdr[0] = 1;	113	hdr[0] = 1;
192	hdr[1] = (len / pagesize) - 1;	114	hdr[1] = (len / pagesize) - 1;
193	mkswap_generate_uuid((void*) &hdr[3]);	115	#if ENABLE_FEATURE_MKSWAP_UUID
		116	char uuid_string[32];
		117	generate_uuid((void*) &hdr[3]);
		118	bin2hex(uuid_string, (void*) &hdr[3], 16);
		119	/* f.e. UUID=dfd9c173-be52-4d27-99a5-c34c6c2ff55f */
		120	printf("UUID=%.8s" "-%.4s-%.4s-%.4s-%.12s\n",
		121	uuid_string,
		122	uuid_string+8,
		123	uuid_string+8+4,
		124	uuid_string+8+4+4,
		125	uuid_string+8+4+4+4
		126	);
		127	#endif
194		128
195	// Write the header. Sync to disk because some kernel versions check	129	// Write the header. Sync to disk because some kernel versions check
196	// signature on disk (not in cache) during swapon.	130	// signature on disk (not in cache) during swapon.