[src/trunk]: src/external/bsd/file fix der.c bump shared library

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4c9d40a8c22d
branches:  trunk
changeset: 351355:4c9d40a8c22d
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 10 18:11:17 2017 +0000

description:
fix der.c bump shared library

diffstat:

 external/bsd/file/dist/src/der.c    |  12 ++++++------
 external/bsd/file/lib/Makefile      |   4 ++--
 external/bsd/file/lib/shlib_version |   4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (71 lines):

diff -r 8d30ab209611 -r 4c9d40a8c22d external/bsd/file/dist/src/der.c
--- a/external/bsd/file/dist/src/der.c  Fri Feb 10 18:06:59 2017 +0000
+++ b/external/bsd/file/dist/src/der.c  Fri Feb 10 18:11:17 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: der.c,v 1.1.1.1 2017/02/10 17:42:57 christos Exp $     */
+/*     $NetBSD: der.c,v 1.2 2017/02/10 18:11:17 christos Exp $ */
 
 /*-
  * Copyright (c) 2016 Christos Zoulas
@@ -40,7 +40,7 @@
 #if 0
 FILE_RCSID("@(#)$File: der.c,v 1.11 2016/11/07 15:51:23 christos Exp $")
 #else
-__RCSID("$NetBSD: der.c,v 1.1.1.1 2017/02/10 17:42:57 christos Exp $");
+__RCSID("$NetBSD: der.c,v 1.2 2017/02/10 18:11:17 christos Exp $");
 #endif
 #endif
 #endif
@@ -207,7 +207,7 @@
 
        if (*p + len >= l)
                return DER_BAD;
-       return len;
+       return CAST(uint32_t, len);
 }
 
 static const char *
@@ -266,12 +266,12 @@
 #endif
        if (m->cont_level != 0) {
                if (offs + tlen > nbytes)
-                       return DER_BAD;
-               ms->c.li[m->cont_level - 1].off = offs + tlen;
+                       return -1;
+               ms->c.li[m->cont_level - 1].off = CAST(int, offs + tlen);
                DPRINTF(("cont_level[%u] = %u\n", m->cont_level - 1,
                    ms->c.li[m->cont_level - 1].off));
        }
-       return offs;
+       return CAST(int32_t, offs);
 }
 
 int
diff -r 8d30ab209611 -r 4c9d40a8c22d external/bsd/file/lib/Makefile
--- a/external/bsd/file/lib/Makefile    Fri Feb 10 18:06:59 2017 +0000
+++ b/external/bsd/file/lib/Makefile    Fri Feb 10 18:11:17 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2017/01/10 13:51:36 christos Exp $
+#      $NetBSD: Makefile,v 1.8 2017/02/10 18:11:18 christos Exp $
 #
 
 USE_FORT?= yes # data driven bugs?
@@ -19,7 +19,7 @@
 
 SRCS=          magic.c apprentice.c softmagic.c ascmagic.c compress.c  \
                is_tar.c readelf.c print.c fsmagic.c apptype.c funcs.c \
-               cdf.c readcdf.c cdf_time.c encoding.c
+               cdf.c readcdf.c cdf_time.c encoding.c der.c
 MAN=           libmagic.3
 MLINKS+=       libmagic.3 magic_open.3 \
                libmagic.3 magic_close.3 \
diff -r 8d30ab209611 -r 4c9d40a8c22d external/bsd/file/lib/shlib_version
--- a/external/bsd/file/lib/shlib_version       Fri Feb 10 18:06:59 2017 +0000
+++ b/external/bsd/file/lib/shlib_version       Fri Feb 10 18:11:17 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shlib_version,v 1.5 2015/01/02 21:15:32 christos Exp $
+#      $NetBSD: shlib_version,v 1.6 2017/02/10 18:11:18 christos Exp $
 #
 major=5
-minor=1
+minor=2