summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRene Mayrhofer <rene@mayrhofer.eu.org>2010-08-09 08:09:54 +0000
committerRene Mayrhofer <rene@mayrhofer.eu.org>2010-08-09 08:09:54 +0000
commitb8064f4099997a9e2179f3ad4ace605f5ccac3a1 (patch)
tree81778e976b476374c48b4fe83d084b986b890421 /scripts
parent1ac70afcc1f7d6d2738a34308810719b0976d29f (diff)
downloadvyos-strongswan-b8064f4099997a9e2179f3ad4ace605f5ccac3a1.tar.gz
vyos-strongswan-b8064f4099997a9e2179f3ad4ace605f5ccac3a1.zip
[svn-upgrade] new version strongswan (4.4.1)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.in2
-rw-r--r--scripts/key2keyid.c16
-rw-r--r--scripts/keyid2sql.c4
3 files changed, 11 insertions, 11 deletions
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 6a75fa7ae..20e6df94c 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/scripts/key2keyid.c b/scripts/key2keyid.c
index cd6ebc1ed..551d031c6 100644
--- a/scripts/key2keyid.c
+++ b/scripts/key2keyid.c
@@ -37,17 +37,17 @@ int main(int argc, char *argv[])
printf("parsed %d bits %N private key.\n",
private->get_keysize(private)*8,
key_type_names, private->get_type(private));
- if (private->get_fingerprint(private, KEY_ID_PUBKEY_INFO_SHA1, &chunk))
+ if (private->get_fingerprint(private, KEYID_PUBKEY_INFO_SHA1, &chunk))
{
printf("subjectPublicKeyInfo keyid: %#B\n", &chunk);
}
- if (private->get_fingerprint(private, KEY_ID_PUBKEY_SHA1, &chunk))
+ if (private->get_fingerprint(private, KEYID_PUBKEY_SHA1, &chunk))
{
printf("subjectPublicKey keyid: %#B\n", &chunk);
}
- if (private->get_fingerprint(private, KEY_ID_PGPV3, &chunk))
+ if (private->get_fingerprint(private, KEYID_PGPV3, &chunk))
{
- printf("PGP verison 3 keyid: %#B\n", &chunk);
+ printf("PGP version 3 keyid: %#B\n", &chunk);
}
private->destroy(private);
return 0;
@@ -67,17 +67,17 @@ int main(int argc, char *argv[])
printf("parsed %d bits %N public key.\n",
public->get_keysize(public)*8,
key_type_names, public->get_type(public));
- if (public->get_fingerprint(public, KEY_ID_PUBKEY_INFO_SHA1, &chunk))
+ if (public->get_fingerprint(public, KEYID_PUBKEY_INFO_SHA1, &chunk))
{
printf("subjectPublicKeyInfo keyid: %#B\n", &chunk);
}
- if (public->get_fingerprint(public, KEY_ID_PUBKEY_SHA1, &chunk))
+ if (public->get_fingerprint(public, KEYID_PUBKEY_SHA1, &chunk))
{
printf("subjectPublicKey keyid: %#B\n", &chunk);
}
- if (public->get_fingerprint(public, KEY_ID_PGPV3, &chunk))
+ if (public->get_fingerprint(public, KEYID_PGPV3, &chunk))
{
- printf("PGP verison 3 keyid: %#B\n", &chunk);
+ printf("PGP version 3 keyid: %#B\n", &chunk);
}
public->destroy(public);
return 0;
diff --git a/scripts/keyid2sql.c b/scripts/keyid2sql.c
index 2d17c273d..e37303c08 100644
--- a/scripts/keyid2sql.c
+++ b/scripts/keyid2sql.c
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
BUILD_END);
if (private)
{
- if (private->get_fingerprint(private, KEY_ID_PUBKEY_SHA1, &chunk))
+ if (private->get_fingerprint(private, KEYID_PUBKEY_SHA1, &chunk))
{
printf("%d, X'", ID_KEY_ID);
for (n = 0; n < chunk.len; n++)
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
}
if (public)
{
- if (public->get_fingerprint(public, KEY_ID_PUBKEY_SHA1, &chunk))
+ if (public->get_fingerprint(public, KEYID_PUBKEY_SHA1, &chunk))
{
printf("%d, X'", ID_KEY_ID);
for (n = 0; n < chunk.len; n++)