Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/netpgpverify Sync with n...



details:   https://anonhg.NetBSD.org/src/rev/e5e2423eab84
branches:  trunk
changeset: 977763:e5e2423eab84
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sun Nov 01 11:29:17 2020 +0000

description:
Sync with netpgpverify-20201101 from pkgsrc (the master for this).

No effective change except for version bump.

diffstat:

 crypto/external/bsd/netpgp/dist/src/netpgpverify/HOWTO                 |   55 +
 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in           |    4 +-
 crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.h               |  284 ----------
 crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h       |    4 +-
 crypto/external/bsd/netpgp/dist/src/netpgpverify/dash-escaped-text     |    7 +
 crypto/external/bsd/netpgp/dist/src/netpgpverify/dash-escaped-text.asc |   21 +
 crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c           |    2 +-
 crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpv-bzlib.h       |  284 ++++++++++
 crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h              |    4 +-
 crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.map            |   17 +
 10 files changed, 391 insertions(+), 291 deletions(-)

diffs (truncated from 755 to 300 lines):

diff -r b9e482d40ee4 -r e5e2423eab84 crypto/external/bsd/netpgp/dist/src/netpgpverify/HOWTO
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/HOWTO    Sun Nov 01 11:29:17 2020 +0000
@@ -0,0 +1,55 @@
+How to use ssh keys in PGP signatures
+=====================================
+
+1. generate a new ssh key pair
+
+       % ssh-keygen -t rsa -b 4096 -f sshtest-20140202
+       Generating public/private rsa key pair.
+       Enter passphrase (empty for no passphrase):
+       Enter same passphrase again:
+       Your identification has been saved in sshtest-20140202.
+       Your public key has been saved in sshtest-20140202.pub.
+       The key fingerprint is:
+       73:98:cf:3d:89:05:a1:6b:39:6b:24:f9:10:32:7a:05 agc%netbsd-001.cupertino.alistaircrooks.com@localhost
+       The key's randomart image is:
+       +--[ RSA 4096]----+
+       |    E     .      |
+       |     .   . .     |
+       |    o o . .      |
+       |   . + o = .     |
+       |  . . + S . .    |
+       |   .   * B + .   |
+       |        + + +    |
+       |       .     .   |
+       |                 |
+       +-----------------+
+       %
+
+2. sign newdata using netpgp
+
+       % netpgp -s -S sshtest-20140202 newdata
+       signature  4096/RSA (Encrypt or Sign) 1c5ef29143e3e3ae 2014-02-02
+       Key fingerprint: a4eb b577 ff2e f878 ea40 8c14 1c5e f291 43e3 e3ae
+       uid              netbsd-001.cupertino.alistaircrooks.com (sshtest-20140202.pub) <agc%netbsd-001.cupertino.alistaircrooks.com@localhost>
+       %
+
+3. verify signature on newdata
+
+       % ./netpgpverify -S sshtest-20140202.pub newdata.gpg
+       Good signature for newdata.gpg made Sun Feb  2 13:40:07 2014
+       signature     4096/RSA (Encrypt or Sign) 1c5ef29143e3e3ae 2014-02-02
+       fingerprint   a4eb b577 ff2e f878 ea40 8c14 1c5e f291 43e3 e3ae
+       uid           netbsd-001.cupertino.alistaircrooks.com (sshtest-20140202.pub) <agc%netbsd-001.cupertino.alistaircrooks.com@localhost>
+
+       %
+
+4. get the contents of the file (only if the signature verifies ok)
+
+       % ./netpgpverify -c cat -S sshtest-20140202.pub newdata.gpg
+       /*-
+        * Copyright (c) 2012 Alistair Crooks <agc%NetBSD.org@localhost>
+        * All rights reserved.
+        *
+        * Redistribution and use in source and binary forms, with or without
+        * modification, are permitted provided that the following conditions
+        * are met:
diff -r b9e482d40ee4 -r e5e2423eab84 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in      Sun Nov 01 11:17:20 2020 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in      Sun Nov 01 11:29:17 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.11 2017/04/17 19:50:28 agc Exp $
+# $NetBSD: Makefile.in,v 1.12 2020/11/01 11:29:17 wiz Exp $
 
 PROG=netpgpverify
 
@@ -16,7 +16,7 @@
 all: ${PROG}
 
 ${PROG}: ${OBJS}
-       ${CC} ${OBJS} -o ${PROG}
+       ${CC} ${LDFLAGS} ${CFLAGS} ${OBJS} -o ${PROG}
 
 install:
        install -c -s ${PROG} ${DESTDIR}${PREFIX}/bin
diff -r b9e482d40ee4 -r e5e2423eab84 crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.h
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.h  Sun Nov 01 11:17:20 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,284 +0,0 @@
-/*     $NetBSD: bzlib.h,v 1.2 2020/05/04 00:18:34 agc Exp $    */
-
-
-/*-------------------------------------------------------------*/
-/*--- Public header file for the library.                   ---*/
-/*---                                               bzlib.h ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.6 of 6 September 2010
-   Copyright (C) 1996-2010 Julian Seward <jseward%bzip.org@localhost>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#ifndef _BZLIB_H
-#define _BZLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BZ_RUN               0
-#define BZ_FLUSH             1
-#define BZ_FINISH            2
-
-#define BZ_OK                0
-#define BZ_RUN_OK            1
-#define BZ_FLUSH_OK          2
-#define BZ_FINISH_OK         3
-#define BZ_STREAM_END        4
-#define BZ_SEQUENCE_ERROR    (-1)
-#define BZ_PARAM_ERROR       (-2)
-#define BZ_MEM_ERROR         (-3)
-#define BZ_DATA_ERROR        (-4)
-#define BZ_DATA_ERROR_MAGIC  (-5)
-#define BZ_IO_ERROR          (-6)
-#define BZ_UNEXPECTED_EOF    (-7)
-#define BZ_OUTBUFF_FULL      (-8)
-#define BZ_CONFIG_ERROR      (-9)
-
-typedef 
-   struct {
-      char *next_in;
-      unsigned int avail_in;
-      unsigned int total_in_lo32;
-      unsigned int total_in_hi32;
-
-      char *next_out;
-      unsigned int avail_out;
-      unsigned int total_out_lo32;
-      unsigned int total_out_hi32;
-
-      void *state;
-
-      void *(*bzalloc)(void *,int,int);
-      void (*bzfree)(void *,void *);
-      void *opaque;
-   } 
-   bz_stream;
-
-
-#ifndef BZ_IMPORT
-#define BZ_EXPORT
-#endif
-
-#ifndef BZ_NO_STDIO
-/* Need a definitition for FILE */
-#include <stdio.h>
-#endif
-
-#ifdef _WIN32
-#   include <windows.h>
-#   ifdef small
-      /* windows.h define small to char */
-#      undef small
-#   endif
-#   ifdef BZ_EXPORT
-#   define BZ_API(func) WINAPI func
-#   define BZ_EXTERN extern
-#   else
-   /* import windows dll dynamically */
-#   define BZ_API(func) (WINAPI * func)
-#   define BZ_EXTERN
-#   endif
-#else
-#   define BZ_API(func) func
-#   define BZ_EXTERN extern
-#endif
-
-
-/*-- Core (low-level) library functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( 
-      bz_stream* strm, 
-      int        blockSize100k, 
-      int        verbosity, 
-      int        workFactor 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompress) ( 
-      bz_stream* strm, 
-      int action 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(netpgpv_BZ2_bzDecompressInit) ( 
-      bz_stream *strm, 
-      int       verbosity, 
-      int       small
-   );
-
-BZ_EXTERN int BZ_API(netpgpv_BZ2_bzDecompress) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(netpgpv_BZ2_bzDecompressEnd) ( 
-      bz_stream *strm 
-   );
-
-
-
-/*-- High(er) level library functions --*/
-
-#ifndef BZ_NO_STDIO
-#define BZ_MAX_UNUSED 5000
-
-typedef void BZFILE;
-
-BZ_EXTERN BZFILE* BZ_API(netpgpv_BZ2_bzReadOpen) ( 
-      int*  bzerror,   
-      FILE* f, 
-      int   verbosity, 
-      int   small,
-      void* unused,    
-      int   nUnused 
-   );
-
-BZ_EXTERN void BZ_API(netpgpv_BZ2_bzReadClose) ( 
-      int*    bzerror, 
-      BZFILE* b 
-   );
-
-BZ_EXTERN void BZ_API(netpgpv_BZ2_bzReadGetUnused) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void**  unused,  
-      int*    nUnused 
-   );
-
-BZ_EXTERN int BZ_API(netpgpv_BZ2_bzRead) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( 
-      int*  bzerror,      
-      FILE* f, 
-      int   blockSize100k, 
-      int   verbosity, 
-      int   workFactor 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWrite) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in, 
-      unsigned int* nbytes_out 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in_lo32, 
-      unsigned int* nbytes_in_hi32, 
-      unsigned int* nbytes_out_lo32, 
-      unsigned int* nbytes_out_hi32
-   );
-#endif
-
-
-/*-- Utility functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 
-      unsigned int  sourceLen,
-      int           blockSize100k, 
-      int           verbosity, 
-      int           workFactor 
-   );
-
-BZ_EXTERN int BZ_API(netpgpv_BZ2_bzBuffToBuffDecompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 



Home | Main Index | Thread Index | Old Index