Pullup ticket #4816 - requested by agc
security/netpgpverify: bug fix patch
security/libnetpgpverify: bug fix patch
Revisions pulled up:
- pkgsrc/security/netpgpverify: Makefile 1.17
- pkgsrc/security/netpgpverify/files/digest.c 1.4
- pkgsrc/security/netpgpverify/files/misc.c 1.4
- pkgsrc/security/netpgpverify/files/rsa.c 1.4
- pkgsrc/security/netpgpverify/files/verify.h 1.16
---
Module Name: pkgsrc
Committed By: agc
Date: Fri Sep 25 15:46:58 UTC 2015
Modified Files:
pkgsrc/security/netpgpverify: Makefile
pkgsrc/security/netpgpverify/files: digest.c misc.c rsa.c verify.h
Log Message:
Update netpgpverify, and libnetpgpverify, from version 20150911 to
version 20150919
Changes:
+ get rid of unnecessary header inclusion (sys/syslog.h), which gives
problems on HP/UX and is unused
from Tobias Nygren
(ryoon)
diff -r1.16 -r1.16.2.1 pkgsrc/security/netpgpverify/Makefile| @@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.16 2015/09/12 02:19:06 agc Exp $ | 1 | # $NetBSD: Makefile,v 1.16.2.1 2015/09/26 06:04:13 ryoon Exp $ | |
| 2 | 2 | |||
| 3 | DISTNAME= netpgpverify-20150911 | 3 | DISTNAME= netpgpverify-20150919 | |
| 4 | CATEGORIES= security | 4 | CATEGORIES= security | |
| 5 | MASTER_SITES= # empty | 5 | MASTER_SITES= # empty | |
| 6 | DISTFILES= # empty | 6 | DISTFILES= # empty | |
| 7 | 7 | |||
| 8 | MAINTAINER= agc@NetBSD.org | 8 | MAINTAINER= agc@NetBSD.org | |
| 9 | HOMEPAGE= http://www.NetBSD.org/ | 9 | HOMEPAGE= http://www.NetBSD.org/ | |
| 10 | COMMENT= Standalone PGP and ssh signature verification utility | 10 | COMMENT= Standalone PGP and ssh signature verification utility | |
| 11 | LICENSE= modified-bsd | 11 | LICENSE= modified-bsd | |
| 12 | 12 | |||
| 13 | AUTO_MKDIRS= yes | 13 | AUTO_MKDIRS= yes | |
| 14 | GNU_CONFIGURE= yes | 14 | GNU_CONFIGURE= yes | |
| 15 | 15 | |||
| 16 | TEST_TARGET= tst | 16 | TEST_TARGET= tst |
| @@ -17,27 +17,26 @@ | @@ -17,27 +17,26 @@ | |||
| 17 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 17 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
| 18 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 18 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
| 19 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 19 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
| 20 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 20 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
| 21 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
| 22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
| 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| 24 | */ | 24 | */ | |
| 25 | #include "config.h" | 25 | #include "config.h" | |
| 26 | 26 | |||
| 27 | #include <sys/types.h> | 27 | #include <sys/types.h> | |
| 28 | #include <sys/stat.h> | 28 | #include <sys/stat.h> | |
| 29 | #include <sys/param.h> | 29 | #include <sys/param.h> | |
| 30 | #include <sys/syslog.h> | |||
| 31 | 30 | |||
| 32 | #include <arpa/inet.h> | 31 | #include <arpa/inet.h> | |
| 33 | #include <ctype.h> | 32 | #include <ctype.h> | |
| 34 | #include <inttypes.h> | 33 | #include <inttypes.h> | |
| 35 | #include <stdarg.h> | 34 | #include <stdarg.h> | |
| 36 | #include <stdio.h> | 35 | #include <stdio.h> | |
| 37 | #include <stdlib.h> | 36 | #include <stdlib.h> | |
| 38 | #include <string.h> | 37 | #include <string.h> | |
| 39 | #include <time.h> | 38 | #include <time.h> | |
| 40 | #include <unistd.h> | 39 | #include <unistd.h> | |
| 41 | 40 | |||
| 42 | #include "md5.h" | 41 | #include "md5.h" | |
| 43 | #include "rmd160.h" | 42 | #include "rmd160.h" |
| @@ -15,27 +15,26 @@ | @@ -15,27 +15,26 @@ | |||
| 15 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 15 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
| 16 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 16 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
| 17 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 17 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
| 18 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 18 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
| 19 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 19 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
| 20 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 20 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
| 21 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
| 22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
| 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| 24 | */ | 24 | */ | |
| 25 | #include "config.h" | 25 | #include "config.h" | |
| 26 | 26 | |||
| 27 | #include <sys/types.h> | 27 | #include <sys/types.h> | |
| 28 | #include <sys/syslog.h> | |||
| 29 | 28 | |||
| 30 | #ifdef _KERNEL | 29 | #ifdef _KERNEL | |
| 31 | # include <sys/kmem.h> | 30 | # include <sys/kmem.h> | |
| 32 | #else | 31 | #else | |
| 33 | # include <stdio.h> | 32 | # include <stdio.h> | |
| 34 | # include <stdlib.h> | 33 | # include <stdlib.h> | |
| 35 | # include <string.h> | 34 | # include <string.h> | |
| 36 | # include <unistd.h> | 35 | # include <unistd.h> | |
| 37 | #endif | 36 | #endif | |
| 38 | 37 | |||
| 39 | #include "misc.h" | 38 | #include "misc.h" | |
| 40 | #include "digest.h" | 39 | #include "digest.h" | |
| 41 | #include "rsa.h" | 40 | #include "rsa.h" |
| @@ -14,27 +14,26 @@ | @@ -14,27 +14,26 @@ | |||
| 14 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 14 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
| 15 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 15 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
| 16 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 16 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
| 17 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 17 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
| 18 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 18 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
| 19 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 19 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
| 20 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 20 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
| 21 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
| 22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
| 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| 24 | */ | 24 | */ | |
| 25 | #include <sys/types.h> | 25 | #include <sys/types.h> | |
| 26 | #include <sys/param.h> | 26 | #include <sys/param.h> | |
| 27 | #include <sys/syslog.h> | |||
| 28 | 27 | |||
| 29 | #ifdef _KERNEL | 28 | #ifdef _KERNEL | |
| 30 | # include <sys/kmem.h> | 29 | # include <sys/kmem.h> | |
| 31 | #else | 30 | #else | |
| 32 | # include <ctype.h> | 31 | # include <ctype.h> | |
| 33 | # include <inttypes.h> | 32 | # include <inttypes.h> | |
| 34 | # include <stdarg.h> | 33 | # include <stdarg.h> | |
| 35 | # include <stdio.h> | 34 | # include <stdio.h> | |
| 36 | # include <stdlib.h> | 35 | # include <stdlib.h> | |
| 37 | # include <string.h> | 36 | # include <string.h> | |
| 38 | # include <time.h> | 37 | # include <time.h> | |
| 39 | # include <unistd.h> | 38 | # include <unistd.h> | |
| 40 | #endif | 39 | #endif |
| @@ -13,29 +13,29 @@ | @@ -13,29 +13,29 @@ | |||
| 13 | * | 13 | * | |
| 14 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 14 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
| 15 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 15 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
| 16 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 16 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
| 17 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 17 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
| 18 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 18 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
| 19 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 19 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
| 20 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 20 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
| 21 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
| 22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
| 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| 24 | */ | 24 | */ | |
| 25 | #ifndef NETPGP_VERIFY_H_ | 25 | #ifndef NETPGP_VERIFY_H_ | |
| 26 | #define NETPGP_VERIFY_H_ 20150911 | 26 | #define NETPGP_VERIFY_H_ 20150919 | |
| 27 | 27 | |||
| 28 | #define NETPGPVERIFY_VERSION "netpgpverify portable 20150901" | 28 | #define NETPGPVERIFY_VERSION "netpgpverify portable 20150919" | |
| 29 | 29 | |||
| 30 | #include <sys/types.h> | 30 | #include <sys/types.h> | |
| 31 | 31 | |||
| 32 | #include <inttypes.h> | 32 | #include <inttypes.h> | |
| 33 | 33 | |||
| 34 | #ifndef PGPV_ARRAY | 34 | #ifndef PGPV_ARRAY | |
| 35 | /* creates 2 unsigned vars called "name"c and "name"size in current scope */ | 35 | /* creates 2 unsigned vars called "name"c and "name"size in current scope */ | |
| 36 | /* also creates an array called "name"s in current scope */ | 36 | /* also creates an array called "name"s in current scope */ | |
| 37 | #define PGPV_ARRAY(type, name) \ | 37 | #define PGPV_ARRAY(type, name) \ | |
| 38 | unsigned name##c; unsigned name##vsize; type *name##s | 38 | unsigned name##c; unsigned name##vsize; type *name##s | |
| 39 | #endif | 39 | #endif | |
| 40 | 40 | |||
| 41 | /* 64bit key ids */ | 41 | /* 64bit key ids */ |