diff options
author | lloyd <[email protected]> | 2009-07-21 04:22:23 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2009-07-21 04:22:23 +0000 |
commit | 75f5829775ec225e5295822ab2ca1d4ecf9ca5bf (patch) | |
tree | ef72d15bbd509a57645e1206068db9b3360a318d /src/pubkey | |
parent | 2b06fc67c0ead33086255bfce986cf21429ffc0d (diff) |
Move from pk_codecs to pubkey to solve merge problem
Diffstat (limited to 'src/pubkey')
-rw-r--r-- | src/pubkey/pkcs8.cpp (renamed from src/pubkey/pk_codecs/pkcs8.cpp) | 0 | ||||
-rw-r--r-- | src/pubkey/pkcs8.h (renamed from src/pubkey/pk_codecs/pkcs8.h) | 0 | ||||
-rw-r--r-- | src/pubkey/x509_key.cpp (renamed from src/pubkey/pk_codecs/x509_key.cpp) | 0 | ||||
-rw-r--r-- | src/pubkey/x509_key.h (renamed from src/pubkey/pk_codecs/x509_key.h) | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/src/pubkey/pk_codecs/pkcs8.cpp b/src/pubkey/pkcs8.cpp index 8a464ecfe..8a464ecfe 100644 --- a/src/pubkey/pk_codecs/pkcs8.cpp +++ b/src/pubkey/pkcs8.cpp diff --git a/src/pubkey/pk_codecs/pkcs8.h b/src/pubkey/pkcs8.h index 87f8ba326..87f8ba326 100644 --- a/src/pubkey/pk_codecs/pkcs8.h +++ b/src/pubkey/pkcs8.h diff --git a/src/pubkey/pk_codecs/x509_key.cpp b/src/pubkey/x509_key.cpp index 455e627f3..455e627f3 100644 --- a/src/pubkey/pk_codecs/x509_key.cpp +++ b/src/pubkey/x509_key.cpp diff --git a/src/pubkey/pk_codecs/x509_key.h b/src/pubkey/x509_key.h index 9404b7ecc..9404b7ecc 100644 --- a/src/pubkey/pk_codecs/x509_key.h +++ b/src/pubkey/x509_key.h |