Module Name: src
Committed By: agc
Date: Sun Nov 7 21:41:39 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c ssh2pgp.c
Added Files:
src/crypto/external/bsd/netpgp/dist/src/lib: ssh2pgp.h
Removed Files:
src/crypto/external/bsd/netpgp/dist/src/lib: ops-ssh.h
Log Message:
Rename internal ops-ssh.h header file to ssh2pgp.h to better reflect its
use.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.3 -r0 src/crypto/external/bsd/netpgp/dist/src/lib/ops-ssh.h
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.81 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.82
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.81 Sun Nov 7 08:39:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Sun Nov 7 21:41:38 2010
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.81 2010/11/07 08:39:59 agc Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.82 2010/11/07 21:41:38 agc Exp $");
#endif
#include <sys/types.h>
@@ -81,7 +81,7 @@
#include "readerwriter.h"
#include "netpgpdefs.h"
#include "crypto.h"
-#include "ops-ssh.h"
+#include "ssh2pgp.h"
#include "defs.h"
/* read any gpg config file */
Index: src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.19 src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.20
--- src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.19 Sun Nov 7 21:16:00 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c Sun Nov 7 21:41:39 2010
@@ -68,7 +68,7 @@
#include "netpgpsdk.h"
#include "crypto.h"
#include "netpgpdigest.h"
-#include "ops-ssh.h"
+#include "ssh2pgp.h"
/* structure for earching for constant strings */
typedef struct str_t {
Added files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.h
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.h:1.1
--- /dev/null Sun Nov 7 21:41:39 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.h Sun Nov 7 21:41:39 2010
@@ -0,0 +1,41 @@
+/*-
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Alistair Crooks (a...@netbsd.org)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef SSH2PGP_H_
+#define SSH2PGP_H_
+
+#include "keyring.h"
+#include "types.h"
+
+int pgp_ssh2pubkey(pgp_io_t *, const char *, pgp_key_t *, pgp_hash_alg_t);
+int pgp_ssh2seckey(pgp_io_t *, const char *, pgp_key_t *, pgp_pubkey_t *, pgp_hash_alg_t);
+
+int pgp_ssh2_readkeys(pgp_io_t *, pgp_keyring_t *, pgp_keyring_t *,
+ const char *, const char *, unsigned);
+
+#endif
