[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib Rename internal ops-...

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

details:   https://anonhg.NetBSD.org/src/rev/bd6d102363cc
branches:  trunk
changeset: 758553:bd6d102363cc
user:      agc <agc%NetBSD.org@localhost>
date:      Sun Nov 07 21:41:38 2010 +0000

description:
Rename internal ops-ssh.h header file to ssh2pgp.h to better reflect its
use.

diffstat:

 crypto/external/bsd/netpgp/dist/src/lib/netpgp.c  |   4 +-
 crypto/external/bsd/netpgp/dist/src/lib/ops-ssh.h |  41 -----------------------
 crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c |   2 +-
 crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.h |  41 +++++++++++++++++++++++
 4 files changed, 44 insertions(+), 44 deletions(-)

diffs (123 lines):

diff -r f79c48a01ddd -r bd6d102363cc crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c  Sun Nov 07 21:16:00 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c  Sun Nov 07 21:41:38 2010 +0000
@@ -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 */
diff -r f79c48a01ddd -r bd6d102363cc crypto/external/bsd/netpgp/dist/src/lib/ops-ssh.h
--- a/crypto/external/bsd/netpgp/dist/src/lib/ops-ssh.h Sun Nov 07 21:16:00 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Alistair Crooks (agc%NetBSD.org@localhost)
- *
- * 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 PGP_SSH_H_
-#define PGP_SSH_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
diff -r f79c48a01ddd -r bd6d102363cc crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c Sun Nov 07 21:16:00 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c Sun Nov 07 21:41:38 2010 +0000
@@ -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 {
diff -r f79c48a01ddd -r bd6d102363cc crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.h Sun Nov 07 21:41:38 2010 +0000
@@ -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 (agc%NetBSD.org@localhost)
+ *
+ * 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