Attachment #173362 for bug #211626

Lines 221-230 Link Here

(-)include/stdlib.h (-4 lines)
221	long random(void);	221	long random(void);
222	unsigned short	222	unsigned short
223	*seed48(unsigned short[3]);	223	*seed48(unsigned short[3]);
224	#ifndef _SETKEY_DECLARED
225	int setkey(const char *);
226	#define _SETKEY_DECLARED
227	#endif
228	char setstate(/ const / char );	224	char setstate(/ const / char );
229	void srand48(long);	225	void srand48(long);
230	void srandom(unsigned int);	226	void srandom(unsigned int);




/* X/Open System Interfaces */
#if __XSI_VISIBLE
char	*crypt(const char *, const char *);
/* char	*ctermid(char *); */		/* XXX ??? */
int	 encrypt(char *, int);
long	 gethostid(void);
int	 lockf(int, int, off_t);
int	 nice(int);

const char *
	 crypt_get_format(void);
int	 crypt_set_format(const char *);
int	 des_cipher(const char *, char *, long, int);
int	 des_setkey(const char *key);
int	 dup3(int, int, int);
int	 eaccess(const char *, int);
void	 endusershell(void);

int	 setgroups(int, const gid_t *);
void	 sethostid(long);
int	 sethostname(const char *, int);
#ifndef _SETKEY_DECLARED
int	 setkey(const char *);
#define	_SETKEY_DECLARED
#endif
int	 setlogin(const char *);
int	 setloginclass(const char *);
void	*setmode(const char *);

Lines 73-82 Link Here

(-)lib/libc/gen/Symbol.map (-4 lines)
73	clock;	73	clock;
74	closedir;	74	closedir;
75	confstr;	75	confstr;
76	encrypt;
77	des_setkey;
78	des_cipher;
79	setkey;
80	ctermid;	76	ctermid;
81	ctermid_r;	77	ctermid_r;
82	daemon;	78	daemon;




 * encryption, make sure you've got libcrypt.a around.
 */

__warn_references(des_setkey,
	"WARNING!  des_setkey(3) not present in the system!");

/* ARGSUSED */
int
__freebsd11_des_setkey(const char *key __unused)
{
	fprintf(stderr, "WARNING!  des_setkey(3) not present in the system!\n");
	return (0);
}

__warn_references(des_cipher,
	"WARNING!  des_cipher(3) not present in the system!");

/* ARGSUSED */
int
__freebsd11_des_cipher(const char *in, char *out, long salt __unused,
    int num_iter __unused)
{
	fprintf(stderr, "WARNING!  des_cipher(3) not present in the system!\n");
	bcopy(in, out, 8);

	return (0);
}

__warn_references(setkey,
	"WARNING!  setkey(3) not present in the system!");

/* ARGSUSED */
int
__freebsd11_setkey(const char *key __unused)
{
	fprintf(stderr, "WARNING!  setkey(3) not present in the system!\n");
	return (0);
}

__warn_references(encrypt,
	"WARNING!  encrypt(3) not present in the system!");

/* ARGSUSED */
int
__freebsd11_encrypt(char *block __unused, int flag __unused)
{
	fprintf(stderr, "WARNING!  encrypt(3) not present in the system!\n");
	return (0);
}

__sym_compat(des_setkey, __freebsd11_des_setkey, FBSD_1.0);
__sym_compat(des_cipher, __freebsd11_des_cipher, FBSD_1.0);
__sym_compat(setkey, __freebsd11_setkey, FBSD_1.0);
__sym_compat(encrypt, __freebsd11_encrypt, FBSD_1.0);

Return to bug 211626

Lines 448-455 Link Here

(-)include/unistd.h (-8 lines)
448	/* X/Open System Interfaces */	448	/* X/Open System Interfaces */
449	#if __XSI_VISIBLE	449	#if __XSI_VISIBLE
450	char crypt(const char , const char *);	450	char crypt(const char , const char *);
451	/* char ctermid(char ); / / XXX ??? */
452	int encrypt(char *, int);
453	long gethostid(void);	451	long gethostid(void);
454	int lockf(int, int, off_t);	452	int lockf(int, int, off_t);
455	int nice(int);	453	int nice(int);
Lines 490-497 Link Here
490	const char *	488	const char *
491	crypt_get_format(void);	489	crypt_get_format(void);
492	int crypt_set_format(const char *);	490	int crypt_set_format(const char *);
493	int des_cipher(const char , char , long, int);
494	int des_setkey(const char *key);
495	int dup3(int, int, int);	491	int dup3(int, int, int);
496	int eaccess(const char *, int);	492	int eaccess(const char *, int);
497	void endusershell(void);	493	void endusershell(void);
Lines 559-568 Link Here
559	int setgroups(int, const gid_t *);	555	int setgroups(int, const gid_t *);
560	void sethostid(long);	556	void sethostid(long);
561	int sethostname(const char *, int);	557	int sethostname(const char *, int);
562	#ifndef _SETKEY_DECLARED
563	int setkey(const char *);
564	#define _SETKEY_DECLARED
565	#endif
566	int setlogin(const char *);	558	int setlogin(const char *);
567	int setloginclass(const char *);	559	int setloginclass(const char *);
568	void setmode(const char );	560	void setmode(const char );

Lines 48-70 Link Here

(-)lib/libc/gen/crypt.c (-16 / +10 lines)
48	* encryption, make sure you've got libcrypt.a around.	48	* encryption, make sure you've got libcrypt.a around.
49	*/	49	*/
50		50
51	__warn_references(des_setkey,
52	"WARNING! des_setkey(3) not present in the system!");
53
54	/* ARGSUSED */	51	/* ARGSUSED */
55	int	52	int
56	des_setkey(const char *key __unused)	53	__freebsd11_des_setkey(const char *key __unused)
57	{	54	{
58	fprintf(stderr, "WARNING! des_setkey(3) not present in the system!\n");	55	fprintf(stderr, "WARNING! des_setkey(3) not present in the system!\n");
59	return (0);	56	return (0);
60	}	57	}
61		58
62	__warn_references(des_cipher,
63	"WARNING! des_cipher(3) not present in the system!");
64
65	/* ARGSUSED */	59	/* ARGSUSED */
66	int	60	int
67	des_cipher(const char in, char out, long salt __unused, int num_iter __unused)	61	__freebsd11_des_cipher(const char in, char out, long salt __unused,
		62	int num_iter __unused)
68	{	63	{
69	fprintf(stderr, "WARNING! des_cipher(3) not present in the system!\n");	64	fprintf(stderr, "WARNING! des_cipher(3) not present in the system!\n");
70	bcopy(in, out, 8);	65	bcopy(in, out, 8);
Lines 71-94 Link Here
71	return (0);	66	return (0);
72	}	67	}
73		68
74	__warn_references(setkey,
75	"WARNING! setkey(3) not present in the system!");
76
77	/* ARGSUSED */	69	/* ARGSUSED */
78	int	70	int
79	setkey(const char *key __unused)	71	__freebsd11_setkey(const char *key __unused)
80	{	72	{
81	fprintf(stderr, "WARNING! setkey(3) not present in the system!\n");	73	fprintf(stderr, "WARNING! setkey(3) not present in the system!\n");
82	return (0);	74	return (0);
83	}	75	}
84		76
85	__warn_references(encrypt,
86	"WARNING! encrypt(3) not present in the system!");
87
88	/* ARGSUSED */	77	/* ARGSUSED */
89	int	78	int
90	encrypt(char *block __unused, int flag __unused)	79	__freebsd11_encrypt(char *block __unused, int flag __unused)
91	{	80	{
92	fprintf(stderr, "WARNING! encrypt(3) not present in the system!\n");	81	fprintf(stderr, "WARNING! encrypt(3) not present in the system!\n");
93	return (0);	82	return (0);
94	}	83	}
		84
		85	__sym_compat(des_setkey, __freebsd11_des_setkey, FBSD_1.0);
		86	__sym_compat(des_cipher, __freebsd11_des_cipher, FBSD_1.0);
		87	__sym_compat(setkey, __freebsd11_setkey, FBSD_1.0);
		88	__sym_compat(encrypt, __freebsd11_encrypt, FBSD_1.0);