summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2001-01-28 10:54:39 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2001-01-28 10:54:39 +0000
commit741332cf0ebbd70d6542a3a617caf554f3ec698b (patch)
tree15d6d0d4f6a947879a26506ec817425d2cbd9c9d
parentbd1796412c08af11c6dcca63189a0a03860f40af (diff)
downloadgnutls-741332cf0ebbd70d6542a3a617caf554f3ec698b.tar.gz
removed unneeded files
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/cert_der.asn117
-rw-r--r--lib/gnutls_cert.lex177
3 files changed, 10 insertions, 186 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 056bea25ab..65b27c871f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,7 +3,7 @@ EXTRA_DIST = debug.h gnutls_compress.h defines.h gnutls_plaintext.h \
gnutls_cipher.h gnutls_buffers.h gnutls_errors.h gnutls_int.h \
gnutls_handshake.h gnutls_num.h gnutls_algorithms.h gnutls_dh.h \
gnutls_kx.h gnutls_hash_int.h gnutls_cipher_int.h gnutls_db.h \
- gnutls_cert.lex gnutls_compress_int.h gnutls_session.h gnutls_priority.h
+ gnutls_compress_int.h gnutls_session.h gnutls_priority.h
lib_LTLIBRARIES = libgnutls.la
libgnutls_la_SOURCES = gnutls.c gnutls_compress.c debug.c gnutls_plaintext.c \
gnutls_cipher.c gnutls_buffers.c gnutls_handshake.c gnutls_num.c \
diff --git a/lib/cert_der.asn1 b/lib/cert_der.asn1
index 3e63626bc0..27da7afc84 100644
--- a/lib/cert_der.asn1
+++ b/lib/cert_der.asn1
@@ -52,18 +52,19 @@ id-ad-caIssuers OBJECT IDENTIFIER ::= { id-ad 2 }
-- attribute data types --
-Attribute ::= SEQUENCE {
- type AttributeType,
- values SET OF AttributeValue
- -- at least one value is required --
-}
-
AttributeType ::= OBJECT IDENTIFIER
-AttributeValue ::= ANY
+--AttributeValue ::= ANY DEFINED BY AttributeType
+
+-- removed --
+--Attribute ::= SEQUENCE {
+-- type AttributeType
+-- values SET OF AttributeValue
+ -- at least one value is required --
+--}
AttributeTypeAndValue ::= SEQUENCE {
type AttributeType,
- value AttributeValue
+ value ANY DEFINED BY type -- AttributeValue
}
-- suggested naming attributes: Definition of the following
diff --git a/lib/gnutls_cert.lex b/lib/gnutls_cert.lex
deleted file mode 100644
index 66fc1f3aca..0000000000
--- a/lib/gnutls_cert.lex
+++ /dev/null
@@ -1,177 +0,0 @@
-/* scanner for DER encoded certificates */
-
-/*
- * Copyright (C) 2000 Tarun Upadhyay <tarun@ebprovider.com>
- *
- * This file is part of GNUTLS.
- *
- * GNUTLS is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GNUTLS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-%{
- /* C declarations block */
-#define CHOP(C) ((c)&'\x7f')
-
- unsigned long size;
- unsigned long levels[64];
- int current = 0;
- unsigned long realsize;
-
- void parselen(void){
- int i;
- char c;
- printf("\tLEN: ");
- c = input();
- realsize = 2;
- if (c & '\x80') {
- printf("%d/", CHOP(c));
- realsize += CHOP(c);
- for (size=0, i = 0; i < CHOP(c); i++){
- size <<= 8;
- size += input();
- }
- }
- else
- size = c;
- realsize += size;
- printf("%d ", size);
- }
-
- void increaselevel(void){
- levels[current++] = realsize;
- levels[current] = 0;
- }
-
- void checklevel(void){
- levels[current] += realsize;
- if (levels[current] == levels[current-1])
- }
-%}
-
-%%
-
-\x01 {
- printf("\nBOOLEAN");
- input();
- printf("%d ", input());
-}
-
-\x02 {
- int i;
- printf("\nINTEGER");
- parselen();
- for (i = 0; i < size; i++)
- printf("%x ", input());
- size = 0;
-}
-
-\x03 |
-\x04 {
- int i;
- printf("\nBIT STRING");
- parselen();
- for (i = 0; i < size ; i++)
- printf("%x ", input());
- size = 0;
-}
-
-\x05 {
- printf("\nNULL");
- input();
-}
-
-\x06 {
- int i;
- printf("\nOID");
- parselen();
- for (i = 0; i < size ; i++)
- printf("%x.", input());
- size = 0;
-}
-
-\x13 |
-\x16 {
- int i;
- printf("\nSTRING");
- parselen();
- for (i = 0; i < size ; i++)
- printf("%c", input());
- size = 0;
-}
-
-\x17 {
- char c;
- printf("\nUTC TIME");
- parselen();
- c = input();
-
- /* year */
- if (c <= '4')
- printf("20");
- else
- printf("19");
- printf("%c", c);
- printf("%c", input());
-
- /* month */
- printf("/%c", input());
- printf("%c", input());
-
- /* day */
- printf("/%c", input());
- printf("%c", input());
-
- /* hours */
- printf(" %c", input());
- printf("%c", input());
-
- /* minutes */
- printf(":%c", input());
- printf("%c", input());
-
- /* seconds */
- printf(":%c", input());
- printf("%c", input());
-
- input();
-}
-
-[\xa0-\xaf] {
- int i;
- printf("\nARRAY[%d]", yytext[0] & '\x07');
- parselen();
- increaselevel();
-}
-
-\x30 {
- printf("\nSEQUENCE");
- parselen();
- increaselevel();
-}
-
-\x31 {
- printf("\nSET");
- parselen();
- increaselevel();
-}
-
-%%
-
-main (int argc, char ** argv){
- yyin = stdin;
- yylex();
- printf("\n");
-}
-