Source tree reorg, phase 1. Almost everything moved, no file contents changed.

svn path=/branches/tk685/; revision=5757

3 files changed, 0 insertions, 475 deletions

diff --git a/utils/print_roa/Makefile.in b/utils/print_roa/Makefile.in
deleted file mode 100644
index 5999b351..00000000
--- a/utils/print_roa/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id$
-
-NAME = print_roa
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean:
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-ROA_DIR = ${abs_top_builddir}/rpkid/tests/smoketest.dir/publication
-
-test: all
-	-date -u +'now:            %Y%m%d%H%M%SZ'
-	if test -d ${ROA_DIR}; then find ${ROA_DIR} -type f -name '*.roa' -print -exec ./${BIN} {} \; ; else :; fi
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -f Makefile
diff --git a/utils/print_roa/print_roa.c b/utils/print_roa/print_roa.c
deleted file mode 100644
index c88fc092..00000000
--- a/utils/print_roa/print_roa.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright (C) 2014  Dragon Research Labs ("DRL")
- * Portions copyright (C) 2008  American Registry for Internet Numbers ("ARIN")
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notices and this permission notice appear in all copies.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DRL AND ARIN DISCLAIM ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL DRL OR
- * ARIN BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
- * OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id$ */
-
-/*
- * Decoder test for ROAs.
- *
- * NB: This does -not- check the CMS signatures, just the encoding.
- */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <getopt.h>
-
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/pem.h>
-#include <openssl/err.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-#include <openssl/safestack.h>
-#include <openssl/conf.h>
-#include <openssl/rand.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/cms.h>
-
-#include <rpki/roa.h>
-
-/*
- * How much buffer space do we need for a raw address?
- */
-#define ADDR_RAW_BUF_LEN	16
-
-
-
-/*
- * Extract signing time from CMS message.
- */
-
-static char *
-extract_signingTime(CMS_ContentInfo *cms, char *buffer, size_t buflen)
-{
-  STACK_OF(CMS_SignerInfo) *sis = NULL;
-  CMS_SignerInfo *si = NULL;
-  X509_ATTRIBUTE *xa = NULL;
-  ASN1_TYPE *so = NULL;
-  int i = -1;
-
-  if (cms == NULL ||
-      buffer == NULL ||
-      buflen < sizeof("20010401123456Z") ||
-      (sis = CMS_get0_SignerInfos(cms)) == NULL ||
-      sk_CMS_SignerInfo_num(sis) != 1 ||
-      (si = sk_CMS_SignerInfo_value(sis, 0)) < 0 ||
-      (i = CMS_signed_get_attr_by_NID(si, NID_pkcs9_signingTime, -1)) < 0 ||
-      (xa = CMS_signed_get_attr(si, i)) == NULL ||
-      xa->single ||
-      sk_ASN1_TYPE_num(xa->value.set) != 1 ||
-      (so = sk_ASN1_TYPE_value(xa->value.set, 0)) == NULL)
-    return NULL;
-
-  assert(buflen > 2);
-  buffer[buflen - 1] = '\0';
-
-  switch (so->type) {
-  case V_ASN1_UTCTIME:
-    strcpy(buffer, (so->value.utctime->data[0] >= '5') ? "19" : "20");
-    return strncpy(buffer + 2, (const char *) so->value.utctime->data, buflen - 3);
-  case V_ASN1_GENERALIZEDTIME:
-    return strncpy(buffer, (const char *) so->value.generalizedtime->data, buflen - 1);
-  default:
-    return NULL;
-  }
-}
-
-
-
-/*
- * Expand the bitstring form of an address into a raw byte array.
- * At the moment this is coded for simplicity, not speed.
- */
-static void addr_expand(unsigned char *addr,
-			const ASN1_BIT_STRING *bs,
-			const int length)
-{
-  assert(bs->length >= 0 && bs->length <= length);
-  if (bs->length > 0) {
-    memcpy(addr, bs->data, bs->length);
-    if ((bs->flags & 7) != 0) {
-      unsigned char mask = 0xFF >> (8 - (bs->flags & 7));
-      addr[bs->length - 1] &= ~mask;
-    }
-  }
-  memset(addr + bs->length, 0, length - bs->length);
-}
-
-/*
- * Extract the prefix length from a bitstring.
- */
-#define addr_prefixlen(bs) ((int) ((bs)->length * 8 - ((bs)->flags & 7)))
-
-/*
- * Read ROA (CMS object) in DER format.
- *
- * NB: When invoked this way, CMS_verify() does -not- verify, it just decodes the ASN.1.
- *
- * Well, OK, this function has evolved to doing a lot more than just
- * reading the object.  Refactor or at least rename, someday.
- */
-static ROA *read_roa(const char *filename,
-		     const int print_cms,
-		     const int print_roa,
-		     const int print_signerinfo,
-		     const int print_brief,
-		     const int print_signingtime)
-{
-  unsigned char addr[ADDR_RAW_BUF_LEN];
-  CMS_ContentInfo *cms = NULL;
-  const ASN1_OBJECT *oid = NULL;
-  char *asID = NULL;
-  BIGNUM *bn = NULL;
-  ROA *r = NULL;
-  char buf[512];
-  BIO *b = NULL;
-  int i, j, k, n;
-
-  if ((b = BIO_new_file(filename, "r")) == NULL ||
-      (cms = d2i_CMS_bio(b, NULL)) == NULL)
-    goto done;
-  BIO_free(b);
-  b = NULL;
-
-  if (print_signerinfo) {
-    STACK_OF(CMS_SignerInfo) *signerInfos = CMS_get0_SignerInfos(cms);
-    STACK_OF(X509) *certs = CMS_get1_certs(cms);
-    STACK_OF(X509_CRL) *crls = CMS_get1_crls(cms);
-    printf("Certificates:   %d\n", certs ? sk_X509_num(certs) : 0);
-    printf("CRLs:           %d\n", crls ? sk_X509_CRL_num(crls) : 0);
-    for (i = 0; i < sk_CMS_SignerInfo_num(signerInfos); i++) {
-      CMS_SignerInfo *si = sk_CMS_SignerInfo_value(signerInfos, i);
-      ASN1_OCTET_STRING *hash = NULL;
-      printf("SignerId[%d]:    ", i);
-      if (CMS_SignerInfo_get0_signer_id(si, &hash, NULL, NULL) && hash != NULL)
-	for (j = 0; j < hash->length; j++)
-	  printf("%02x%s", hash->data[j], j == hash->length - 1 ? "" : ":");
-      else
-	printf("[Could not read SID]");
-      if (certs)
-	for (j = 0; j < sk_X509_num(certs); j++)
-	  if (!CMS_SignerInfo_cert_cmp(si, sk_X509_value(certs, j)))
-	    printf(" [Matches certificate %d]", j);
-      if ((j = CMS_signed_get_attr_by_NID(si, NID_pkcs9_signingTime, -1)) >= 0) {
-	X509_ATTRIBUTE *xa = CMS_signed_get_attr(si, j);
-	if (xa && !xa->single && sk_ASN1_TYPE_num(xa->value.set) == 1) {
-	  ASN1_TYPE *so = sk_ASN1_TYPE_value(xa->value.set, 0);
-	  switch (so->type) {
-	  case V_ASN1_UTCTIME:
-	    printf(" [signingTime(U) %s%s]",
-		   so->value.utctime->data[0] < '5' ? "20" : "19",
-		   so->value.utctime->data);
-	    break;
-	  case  V_ASN1_GENERALIZEDTIME:
-	    printf(" [signingTime(G) %s]",
-		   so->value.generalizedtime->data);
-	    break;
-	  }
-	}
-      }
-      printf("\n");
-    }
-    sk_X509_pop_free(certs, X509_free);
-    sk_X509_CRL_pop_free(crls, X509_CRL_free);
-  }
-
-  if ((b = BIO_new(BIO_s_mem())) == NULL ||
-      CMS_verify(cms, NULL, NULL, NULL, b, CMS_NOCRL | CMS_NO_SIGNER_CERT_VERIFY | CMS_NO_ATTR_VERIFY | CMS_NO_CONTENT_VERIFY) <= 0 ||
-      (r = ASN1_item_d2i_bio(ASN1_ITEM_rptr(ROA), b, NULL)) == NULL)
-    goto done;
-  BIO_free(b);
-  b = NULL;
-
-  if (print_roa) {
-
-    bn = ASN1_INTEGER_to_BN(r->asID, NULL);
-    asID = BN_bn2dec(bn);
-
-    if (print_brief) {
-
-      if (print_signingtime) {
-	char buffer[sizeof("20010401123456Z")], *b;
-	if (!extract_signingTime(cms, buffer, sizeof(buffer)))
-	  goto done;
-	printf("%s ", buffer);
-      }
-
-      fputs(asID, stdout);
-
-    } else {
-
-      if ((oid = CMS_get0_eContentType(cms)) == NULL)
-	goto done;
-      OBJ_obj2txt(buf, sizeof(buf), oid, 0);
-      printf("eContentType:   %s\n", buf);
-
-      if (r->version)
-	printf("version:        %ld\n", ASN1_INTEGER_get(r->version));
-      else
-	printf("version:        0 [Defaulted]\n");
-      printf("asID:           %s\n", asID);
-    }
-
-    for (i = 0; i < sk_ROAIPAddressFamily_num(r->ipAddrBlocks); i++) {
-
-      ROAIPAddressFamily *f = sk_ROAIPAddressFamily_value(r->ipAddrBlocks, i);
-
-      unsigned afi = (f->addressFamily->data[0] << 8) | (f->addressFamily->data[1]);
-
-      if (!print_brief) {
-	printf(" addressFamily: %x", afi);
-	if (f->addressFamily->length == 3)
-	  printf("[%x]", f->addressFamily->data[2]);
-	printf("\n");
-      }
-
-      for (j = 0; j < sk_ROAIPAddress_num(f->addresses); j++) {
-	ROAIPAddress *a = sk_ROAIPAddress_value(f->addresses, j);
-
-	if (print_brief)
-	  printf(" ");
-	else
-	  printf("     IPaddress: ");
-
-	switch (afi) {
-
-	case IANA_AFI_IPV4:
-	  addr_expand(addr, a->IPAddress, 4);
-	  printf("%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
-	  break;
-
-	case IANA_AFI_IPV6:
-	  addr_expand(addr, a->IPAddress, 16);
-	  for (n = 16; n > 1 && addr[n-1] == 0x00 && addr[n-2] == 0x00; n -= 2)
-	    ;
-	  for (k = 0; k < n; k += 2)
-	    printf("%x%s", (addr[k] << 8) | addr[k+1], (k < 14 ? ":" : ""));
-	  if (k < 16)
-	    printf(":");
-	  if (k == 0)
-	    printf(":");
-	  break;
-
-	default:
-	  if (!print_brief) {
-	    for (k = 0; k < a->IPAddress->length; k++)
-	      printf("%s%02x", (k > 0 ? ":" : ""), a->IPAddress->data[k]);
-	    printf("[%d]", (int) (a->IPAddress->flags & 7));
-	  }
-	  break;
-
-	}
-
-	printf("/%u", addr_prefixlen(a->IPAddress));
-
-	if (a->maxLength)
-	  printf("-%ld", ASN1_INTEGER_get(a->maxLength));
-
-	if (!print_brief)
-	  printf("\n");
-      }
-    }
-    if (print_brief)
-      printf("\n");
-  }
-
-  if (print_cms) {
-    if (print_roa)
-      printf("\n");
-    fflush(stdout);
-    if ((b = BIO_new(BIO_s_fd())) == NULL)
-      goto done;
-    BIO_set_fd(b, 1, BIO_NOCLOSE);
-    CMS_ContentInfo_print_ctx(b, cms, 0, NULL);
-    BIO_free(b);
-    b = NULL;
-  }
-
- done:
-  if (ERR_peek_error())
-    ERR_print_errors_fp(stderr);
-  BIO_free(b);
-  BN_free(bn);
-  if (asID)
-    OPENSSL_free(asID);
-  CMS_ContentInfo_free(cms);
-  return r;
-}
-
-
-
-const static struct option longopts[] = {
-  { "brief",	   no_argument, NULL, 'b' },
-  { "print-cms",   no_argument, NULL, 'c' },
-  { "help",	   no_argument, NULL, 'h' },
-  { "signingtime", no_argument, NULL, 's' },
-  { NULL }
-};
-
-static int usage (const char *jane, const int code)
-{
-  FILE *out = code ? stderr : stdout;
-  int i;
-
-  fprintf(out, "usage: %s [options] ROA [ROA...]\n", jane);
-  fprintf(out, "options:\n");
-  for (i = 0; longopts[i].name != NULL; i++)
-    fprintf(out, "  -%c  --%s\n", longopts[i].val, longopts[i].name);
-
-  return code;
-}
-
-/*
- * Main program.
- */
-int main (int argc, char *argv[])
-{
-  int result = 0, print_brief = 0, print_signingtime = 0, print_cms = 0, c;
-  const char *jane = argv[0];
-  ROA *r;
-
-  OpenSSL_add_all_algorithms();
-  ERR_load_crypto_strings();
-
-  while ((c = getopt_long(argc, argv, "bchs", longopts, NULL)) != -1) {
-    switch (c) {
-    case 'b':
-      print_brief = 1;
-      break;
-    case 'c':
-      print_cms = 1;
-      break;
-    case 's':
-      print_signingtime = 1;
-      break;
-    case 'h':
-      return usage(jane, 0);
-    default:
-      return usage(jane, 1);
-    }
-  }
-
-  argc -= optind;
-  argv += optind;
-
-  if (argc == 0)
-    return usage(jane, 1);
-
-  while (argc-- > 0) {
-    r = read_roa(*argv++, print_cms, 1, !print_brief, print_brief, print_signingtime);
-    result |=  r == NULL;
-    ROA_free(r);
-  }
-  return result;
-}
diff --git a/utils/print_roa/strip_roa.sh b/utils/print_roa/strip_roa.sh
deleted file mode 100755
index e2dacf86..00000000
--- a/utils/print_roa/strip_roa.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh -
-# $Id$
-#
-# Copyright (C) 2010  Internet Systems Consortium ("ISC")
-# 
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-#
-# Strip boring parts of print_roa's output to make a (somewhat) terser
-# description, one line per ROA.  This is intended for use in
-# comparing sets of ROAs using text comparision tools like "diff" or
-# "comm".  One could definitely do something prettier, but this
-# suffices for basic tests.
-#
-# Use this as in a shell pipeline to postprocess print_roa's output.
-
-awk '
-  /Certificate/ {
-    roa[++n] = "";
-  }
-  /asID|addressFamily|IPaddress/ {
-    roa[n] = roa[n] " " $0;
-  }
-  END {
-    for (i in roa)
-      print roa[i];
-  }
-' |
-tr -s \\011 \\040 |
-sort -u