Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)

Browse Source 
- Fix for possible unset uid/gid in toproto
 - Fix for default mtree style
 - Update libelf
 - Importing libexecinfo
 - Resynchronize GCC, mpc, gmp, mpfr
 - build.sh: Replace params with show-params.
     This has been done as the make target has been renamed in the same
     way, while a new target named params has been added. This new
     target generates a file containing all the parameters, instead of
     printing it on the console.
 - Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
     get getservbyport() out of the inner loop

Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
This commit is contained in:
Lionel Sambuc
2013-12-06 12:04:52 +01:00
parent ff10274392
commit 84d9c625bf
4655 changed files with 379317 additions and 151059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libcrypt/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.24 2012/08/10 04:30:47 joerg Exp $
# $NetBSD: Makefile,v 1.25 2013/08/10 18:42:29 dholland Exp $
USE_SHLIBDIR= yes
@@ -24,5 +24,3 @@ LDSTATIC?= -static
.else
.include <bsd.lib.mk>
.endif
COPTS.crypt-sha1.c+= -Wno-pointer-sign

6
lib/libcrypt/bcrypt.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: bcrypt.c,v 1.17 2012/08/30 12:16:49 drochner Exp $ */
/* $NetBSD: bcrypt.c,v 1.19 2013/08/28 17:47:07 riastradh Exp $ */
/* $OpenBSD: bcrypt.c,v 1.16 2002/02/19 19:39:36 millert Exp $ */
/*
@@ -46,7 +46,7 @@
*
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: bcrypt.c,v 1.17 2012/08/30 12:16:49 drochner Exp $");
__RCSID("$NetBSD: bcrypt.c,v 1.19 2013/08/28 17:47:07 riastradh Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -314,7 +314,7 @@ __bcrypt(const char *key, const char *salt)
encode_base64((u_int8_t *) encrypted + i + 3, csalt, BCRYPT_MAXSALT);
encode_base64((u_int8_t *) encrypted + strlen(encrypted), ciphertext,
4 * BCRYPT_BLOCKS - 1);
__explicit_bzero(&state, sizeof(state));
explicit_memset(&state, 0, sizeof(state));
return encrypted;
}

12
lib/libcrypt/crypt-sha1.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: crypt-sha1.c,v 1.5 2012/08/30 12:16:49 drochner Exp $ */
/* $NetBSD: crypt-sha1.c,v 1.8 2013/08/28 17:47:07 riastradh Exp $ */
/*
* Copyright (c) 2004, Juniper Networks, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
__RCSID("$NetBSD: crypt-sha1.c,v 1.5 2012/08/30 12:16:49 drochner Exp $");
__RCSID("$NetBSD: crypt-sha1.c,v 1.8 2013/08/28 17:47:07 riastradh Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -130,6 +130,8 @@ __crypt_sha1 (const char *pw, const char *salt)
int dl;
unsigned int iterations;
unsigned int i;
/* XXX silence -Wpointer-sign (would be nice to fix this some other way) */
const unsigned char *pwu = (const unsigned char *)pw;
/*
* Salt format is
@@ -166,9 +168,9 @@ __crypt_sha1 (const char *pw, const char *salt)
/*
* Then hmac using <pw> as key, and repeat...
*/
__hmac_sha1(passwd, dl, pw, pl, hmac_buf);
__hmac_sha1((unsigned char *)passwd, dl, pwu, pl, hmac_buf);
for (i = 1; i < iterations; i++) {
__hmac_sha1(hmac_buf, SHA1_SIZE, pw, pl, hmac_buf);
__hmac_sha1(hmac_buf, SHA1_SIZE, pwu, pl, hmac_buf);
}
/* Now output... */
pl = snprintf(passwd, sizeof(passwd), "%s%u$%.*s$",
@@ -190,7 +192,7 @@ __crypt_sha1 (const char *pw, const char *salt)
*ep = '\0';
/* Don't leave anything around in vm they could use. */
__explicit_bzero(hmac_buf, sizeof hmac_buf);
explicit_memset(hmac_buf, 0, sizeof hmac_buf);
return passwd;
}

6
lib/libcrypt/md5crypt.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: md5crypt.c,v 1.12 2012/08/30 12:16:49 drochner Exp $ */
/* $NetBSD: md5crypt.c,v 1.14 2013/08/28 17:47:07 riastradh Exp $ */
/*
* ----------------------------------------------------------------------------
@@ -15,7 +15,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
__RCSID("$NetBSD: md5crypt.c,v 1.12 2012/08/30 12:16:49 drochner Exp $");
__RCSID("$NetBSD: md5crypt.c,v 1.14 2013/08/28 17:47:07 riastradh Exp $");
#endif /* not lint */
#include <unistd.h>
@@ -143,6 +143,6 @@ __md5crypt(const char *pw, const char *salt)
*p = '\0';
/* Don't leave anything around in vm they could use. */
__explicit_bzero(final, sizeof(final));
explicit_memset(final, 0, sizeof(final));
return (passwd);
}

2
lib/libcrypt/shlib_version
View File

@@ -1,5 +1,5 @@
# $NetBSD: shlib_version,v 1.6 2009/01/11 03:07:47 christos Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=0
major=1
minor=0