moved files to comply with rest of directory structure of RS

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5260 b45a01b8-16f6-495d-af2f-9b41ad6348cc

openpgpsdk/src/keyring_local.h

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2005-2008 Nominet UK (www.nic.uk)
- * All rights reserved.
- * Contributors: Ben Laurie, Rachel Willmer. The Contributors have asserted
- * their moral rights under the UK Copyright Design and Patents Act 1988 to
- * be recorded as the authors of this copyright work.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. 
- * 
- * You may obtain a copy of the License at 
- *     http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * 
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \file
- */
-
-#include <openpgpsdk/packet.h>
-
-#define DECLARE_ARRAY(type,arr)	unsigned n##arr; unsigned n##arr##_allocated; type *arr
-#define EXPAND_ARRAY(str,arr) do if(str->n##arr == str->n##arr##_allocated) \
-				{ \
-				str->n##arr##_allocated=str->n##arr##_allocated*2+10; \
-				str->arr=realloc(str->arr,str->n##arr##_allocated*sizeof *str->arr); \
-				} while(0)
-
-/** ops_keydata_key_t
- */
-typedef union
-    {
-    ops_public_key_t pkey;
-    ops_secret_key_t skey;
-    } ops_keydata_key_t;
-    
-
-/** sigpacket_t */
-typedef struct 
-    {
-    ops_user_id_t* userid;
-    ops_packet_t* packet;
-    } sigpacket_t;
-
-// XXX: gonna have to expand this to hold onto subkeys, too...
-/** \struct ops_keydata
- * \todo expand to hold onto subkeys
- */
-struct ops_keydata
-    {
-    DECLARE_ARRAY(ops_user_id_t,uids);
-    DECLARE_ARRAY(ops_packet_t,packets);
-    DECLARE_ARRAY(sigpacket_t, sigs);
-    unsigned char key_id[8];
-    ops_fingerprint_t fingerprint;
-    ops_content_tag_t type;
-    ops_keydata_key_t key;
-    };

openpgpsdk/src/src.pro

@@ -6,12 +6,16 @@ DEFINES *= OPENSSL_NO_IDEA
 QMAKE_CXXFLAGS *= -Wall -Werror -W 
 
 TARGET = ops
-DESTDIR = ../lib
+DESTDIR = lib
 DEPENDPATH += .
-INCLUDEPATH += . ../include
+INCLUDEPATH += . 
 
 #################################### Windows #####################################
 
+linux-* {
+	OBJECTS_DIR = temp/linux/obj
+}
+
 win32 {
 	SSL_DIR = ../../../../OpenSSL
 	ZLIB_DIR = ../../../zlib-1.2.3
@@ -21,41 +25,75 @@ win32 {
 }
 
 # Input
-HEADERS += keyring_local.h parse_local.h
+HEADERS += openpgpsdk/writer.h \
-SOURCES += accumulate.c \
+           openpgpsdk/writer_armoured.h \
-           compress.c \
+           openpgpsdk/version.h \
-           create.c \
+           openpgpsdk/validate.h \
-           crypto.c \
+           openpgpsdk/util.h \
-           errors.c \
+           openpgpsdk/types.h \
-           fingerprint.c \
+           openpgpsdk/streamwriter.h \
-           hash.c \
+           openpgpsdk/std_print.h \
-           keyring.c \
+           openpgpsdk/signature.h \
-           lists.c \
+           openpgpsdk/readerwriter.h \
-           memory.c \
+           openpgpsdk/random.h \
-           openssl_crypto.c \
+           openpgpsdk/partial.h \
-           packet-parse.c \
+           openpgpsdk/packet-show.h \
-           packet-print.c \
+           openpgpsdk/packet-show-cast.h \
-           packet-show.c \
+           openpgpsdk/packet-parse.h \
-           random.c \
+           openpgpsdk/packet.h \
-           reader.c \
+           openpgpsdk/memory.h \
-           reader_armoured.c \
+           openpgpsdk/literal.h \
-           reader_encrypted_se.c \
+           openpgpsdk/lists.h \
-           reader_encrypted_seip.c \
+           openpgpsdk/keyring.h \
-           reader_fd.c \
+           openpgpsdk/hash.h \
-           reader_hashed.c \
+           openpgpsdk/final.h \
-           reader_mem.c \
+           openpgpsdk/defs.h \
-           readerwriter.c \
+           openpgpsdk/errors.h \
-           signature.c \
+           openpgpsdk/crypto.h \
-           symmetric.c \
+           openpgpsdk/create.h \
-           util.c \
+           openpgpsdk/configure.h \
-           validate.c \
+           openpgpsdk/compress.h \
-           writer.c \
+           openpgpsdk/callback.h \
-           writer_armour.c \
+           openpgpsdk/accumulate.h \
-           writer_partial.c \
+           openpgpsdk/armour.h \
-           writer_literal.c \
+           openpgpsdk/parse_local.h \
-           writer_encrypt.c \
+           openpgpsdk/keyring_local.h
-           writer_encrypt_se_ip.c \
+
-           writer_fd.c \
+          
-           writer_memory.c \
+SOURCES += openpgpsdk/accumulate.c \
-           writer_skey_checksum.c \
+           openpgpsdk/compress.c \
-           writer_stream_encrypt_se_ip.c
+           openpgpsdk/create.c \
+           openpgpsdk/crypto.c \
+           openpgpsdk/errors.c \
+           openpgpsdk/fingerprint.c \
+           openpgpsdk/hash.c \
+           openpgpsdk/keyring.c \
+           openpgpsdk/lists.c \
+           openpgpsdk/memory.c \
+           openpgpsdk/openssl_crypto.c \
+           openpgpsdk/packet-parse.c \
+           openpgpsdk/packet-print.c \
+           openpgpsdk/packet-show.c \
+           openpgpsdk/random.c \
+           openpgpsdk/reader.c \
+           openpgpsdk/reader_armoured.c \
+           openpgpsdk/reader_encrypted_se.c \
+           openpgpsdk/reader_encrypted_seip.c \
+           openpgpsdk/reader_fd.c \
+           openpgpsdk/reader_hashed.c \
+           openpgpsdk/reader_mem.c \
+           openpgpsdk/readerwriter.c \
+           openpgpsdk/signature.c \
+           openpgpsdk/symmetric.c \
+           openpgpsdk/util.c \
+           openpgpsdk/validate.c \
+           openpgpsdk/writer.c \
+           openpgpsdk/writer_armour.c \
+           openpgpsdk/writer_partial.c \
+           openpgpsdk/writer_literal.c \
+           openpgpsdk/writer_encrypt.c \
+           openpgpsdk/writer_encrypt_se_ip.c \
+           openpgpsdk/writer_fd.c \
+           openpgpsdk/writer_memory.c \
+           openpgpsdk/writer_skey_checksum.c \
+           openpgpsdk/writer_stream_encrypt_se_ip.c