Skip to content

Commit

Permalink
Updated includes
Browse files Browse the repository at this point in the history
  • Loading branch information
abenmrad committed May 24, 2014
1 parent c71587e commit b0776e1
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "cryptopp"]
path = cryptopp
url = git@github.com:Mowje/cryptopp.git
url = https://github.com/Mowje/cryptopp.git
4 changes: 2 additions & 2 deletions binding.gyp
Expand Up @@ -3,7 +3,7 @@
{
"target_name": "cryptopp",
"sources": ["node-cryptopp.cpp", "keyring.cc"],
"include_dirs": ["./cryptopp/"],
"include_dirs": ["cryptopp/"],
"libraries": ["../cryptopp/libcryptopp.a"],
"cflags!": ["-fno-exceptions"],
"cflags_cc!": ["-fno-exceptions", "-fno-rtti"],
Expand All @@ -18,4 +18,4 @@
]
}
]
}
}
34 changes: 17 additions & 17 deletions keyring.cc
Expand Up @@ -8,15 +8,15 @@
#include <utility>

//Crypto++ imports
#include <base64.h>
#include <cryptopp/base64.h>
using CryptoPP::Base64Encoder;
using CryptoPP::Base64Decoder;

#include <hex.h>
#include <cryptopp/hex.h>
using CryptoPP::HexEncoder;
using CryptoPP::HexDecoder;

#include <filters.h>
#include <cryptopp/filters.h>
using CryptoPP::StringSource;
using CryptoPP::StringSink;
using CryptoPP::ArraySink;
Expand All @@ -26,11 +26,11 @@ using CryptoPP::StreamTransformationFilter;
using CryptoPP::PK_EncryptorFilter;
using CryptoPP::PK_DecryptorFilter;

#include <sha.h>
#include <cryptopp/sha.h>
using CryptoPP::SHA1;
using CryptoPP::SHA256;

#include <eccrypto.h>
#include <cryptopp/eccrypto.h>
using CryptoPP::ECP;
using CryptoPP::EC2N;
using CryptoPP::ECPPoint;
Expand All @@ -42,38 +42,38 @@ using CryptoPP::DL_GroupParameters_EC;
using CryptoPP::DL_GroupPrecomputation;
using CryptoPP::DL_FixedBasePrecomputation;

#include <rsa.h>
#include <cryptopp/rsa.h>
using CryptoPP::RSA;
using CryptoPP::RSAFunction;
using CryptoPP::InvertibleRSAFunction;
using CryptoPP::RSASS;
using CryptoPP::RSAES_OAEP_SHA_Encryptor;
using CryptoPP::RSAES_OAEP_SHA_Decryptor;

#include <pssr.h>
#include <cryptopp/pssr.h>
using CryptoPP::PSS;

#include <dsa.h>
#include <cryptopp/dsa.h>
using CryptoPP::DSA;

#include <osrng.h>
#include <cryptopp/osrng.h>
using CryptoPP::AutoSeededRandomPool;
using CryptoPP::AutoSeededX917RNG;

#include <asn.h>
#include <cryptopp/asn.h>
using CryptoPP::OID;
#include <oids.h>
#include <cryptopp/oids.h>

#include <secblock.h>
#include <cryptopp/secblock.h>
using CryptoPP::SecByteBlock;

#include <pwdbased.h>
#include <cryptopp/pwdbased.h>
using CryptoPP::PKCS5_PBKDF2_HMAC;

#include <aes.h>
#include <cryptopp/aes.h>
using CryptoPP::AES;

#include <modes.h>
#include <cryptopp/modes.h>
using CryptoPP::CFB_Mode;

//Node and class headers import
Expand Down Expand Up @@ -400,7 +400,7 @@ Handle<Value> KeyRing::Agree(const Arguments& args){
ThrowException(Exception::TypeError(String::New("")));
}
} else {
counterpartPubKey =
counterpartPubKey =
}*/
if (counterpartCurve != instance->keyPair->at("curveName")){
ThrowException(Exception::TypeError(String::New("curves are not the same")));
Expand Down Expand Up @@ -1420,4 +1420,4 @@ std::string KeyRing::decryptFile(std::string const& filename, std::string const&
string decrypted;
StringSource(encryptedStr, true, new StreamTransformationFilter(d, new StringSink(decrypted)));
return decrypted;
}
}
2 changes: 1 addition & 1 deletion keyring.h
Expand Up @@ -73,4 +73,4 @@ class KeyRing : public node::ObjectWrap{
static v8::Persistent<v8::Function> constructor;
};

#endif
#endif

0 comments on commit b0776e1

Please sign in to comment.