Convert encrypt.test to use stat_index and remove standalone program.

.hgignore

diff --git a/.hgignore b/.hgignore
index 5d80ffb..52b48ea 100644
--- a/.hgignore
+++ b/.hgignore
@@ -17,14 +17,11 @@
 ^lib/zip_err_str\.c$
 ^lib/zipconf\.h$
 ^man/.*\.html$
-^regress/add_dir$
 ^regress/add_from_buffer$
-^regress/add_from_file$
 ^regress/add_from_filep$
 ^regress/add_from_zip$
 ^regress/cp437$
 ^regress/encoding$
-^regress/encrypt$
 ^regress/fopen_unchanged$
 ^regress/fread$
 ^regress/get_comment$

regress/CMakeLists.txt

diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt
index a22e2d4..e7069ba 100644
--- a/regress/CMakeLists.txt
+++ b/regress/CMakeLists.txt
@@ -4,7 +4,6 @@
   add_from_buffer
   add_from_filep
   add_from_zip
-  encrypt
   fopen_unchanged
   fread
   get_comment

regress/Makefile.am

diff --git a/regress/Makefile.am b/regress/Makefile.am
index 0243c59..ecbc4d5 100644
--- a/regress/Makefile.am
+++ b/regress/Makefile.am
@@ -2,7 +2,6 @@
 	add_from_buffer \
 	add_from_filep \
 	add_from_zip \
-	encrypt \
 	fopen_unchanged \
 	fread \
 	get_comment \

regress/encrypt.c

diff --git a/regress/encrypt.c b/regress/encrypt.c
deleted file mode 100644
index 41a879e..0000000
--- a/regress/encrypt.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-  encrypt.c -- test encryption support
-  Copyright (C) 2006 Dieter Baron and Thomas Klausner
-
-  This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <libzip@nih.at>
-
-  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.
-  3. The names of the authors may not be used to endorse or promote
-     products derived from this software without specific prior
-     written permission.
- 
-  THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
-*/
-
-
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "zip.h"
-
-const char *prg;
-
-int
-main(int argc, char *argv[])
-{
-    const char *archive;
-    struct zip *za;
-    char buf[100];
-    int err;
-    int i;
-    struct zip_stat st;
-
-    prg = argv[0];
-
-    if (argc != 2) {
-	fprintf(stderr, "usage: %s archive\n", prg);
-	return 1;
-    }
-
-    archive = argv[1];
-    
-    if ((za=zip_open(archive, 0, &err)) == NULL) {
-	zip_error_to_str(buf, sizeof(buf), err, errno);
-	fprintf(stderr, "%s: can't open zip archive `%s': %s\n", prg,
-		archive, buf);
-	return 1;
-    }
-
-    for (i=0; i<zip_get_num_files(za); i++) {
-	if (zip_stat_index(za, i, 0, &st) < 0)
-	    fprintf(stderr, "%s: can't stat file %d: %s\n",
-		    prg, i, zip_strerror(za));
-	else
-	    printf("%d: %d\n", i, st.encryption_method);
-    }
-
-    if (zip_close(za) == -1) {
-	fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg, archive, zip_strerror(za));
-	return 1;
-    }
-
-    return 0;
-}

regress/encrypt.test

diff --git a/regress/encrypt.test b/regress/encrypt.test
index ba6502f..e4fca0a 100644
--- a/regress/encrypt.test
+++ b/regress/encrypt.test
@@ -1,7 +1,24 @@
 # test encryption support
-program encrypt
+# XXX: only checks recognition of encrypted entries for now.
+program stat_index
 return 0
-args encrypt.zip
-file encrypt.zip encrypt.zip encrypt.zip
-stdout 0: 1
-stdout 1: 0
+args encrypt.zzip 0 1
+file encrypt.zzip encrypt.zip encrypt.zip
+stdout name: `encrypted'
+stdout index: `0'
+stdout size: `4'
+stdout compressed size: `16'
+stdout mtime: `Mon Apr 24 14:01:34 CET 2006'
+stdout crc: `7e3265a8'
+stdout compression method: `0'
+stdout encryption method: `1'
+stdout 
+stdout name: `plain'
+stdout index: `1'
+stdout size: `4'
+stdout compressed size: `4'
+stdout mtime: `Mon Apr 24 14:01:42 CET 2006'
+stdout crc: `7e3265a8'
+stdout compression method: `0'
+stdout encryption method: `0'
+stdout