Attachment #529350 for bug #654614

View | Details | Raw Unified | Return to bug 654614
Collapse All | Expand All

Lines 20-25 Link Here

(-)orig/src/pycryptopp/cipher/aesmodule.cpp (+2 lines)
20	#include <src-cryptopp/aes.h>	20	#include <src-cryptopp/aes.h>
21	#endif	21	#endif
22		22
		23	typedef unsigned char byte;
		24
23	static const char*const aes___doc__ = "_aes counter mode cipher\n\	25	static const char*const aes___doc__ = "_aes counter mode cipher\n\
24	You are advised to run aes.start_up_self_test() after importing this module.";	26	You are advised to run aes.start_up_self_test() after importing this module.";
25		27

Lines 16-21 Link Here

(-)orig/src/pycryptopp/cipher/xsalsa20module.cpp (+2 lines)
16	#include <src-cryptopp/salsa.h>	16	#include <src-cryptopp/salsa.h>
17	#endif	17	#endif
18		18
		19	typedef unsigned char byte;
		20
19	static const char* const xsalsa20__doc__ = "_xsalsa20 cipher";	21	static const char* const xsalsa20__doc__ = "_xsalsa20 cipher";
20		22
21	static PyObject *xsalsa20_error;	23	static PyObject *xsalsa20_error;

Lines 21-26 Link Here

(-)orig/src/pycryptopp/hash/sha256module.cpp (+2 lines)
21	#include <src-cryptopp/filters.h>	21	#include <src-cryptopp/filters.h>
22	#endif	22	#endif
23		23
		24	typedef unsigned char byte;
		25
24	static const char*const sha256___doc__ = "_sha256 hash function";	26	static const char*const sha256___doc__ = "_sha256 hash function";
25		27
26	static PyObject *sha256_error;	28	static PyObject *sha256_error;

Lines 87-93 Link Here

(-)orig/src/pycryptopp/publickey/rsamodule.cpp (-2 / +2 lines)
87	VerifyingKey_serialize(VerifyingKey self, PyObject dummy) {	87	VerifyingKey_serialize(VerifyingKey self, PyObject dummy) {
88	std::string outstr;	88	std::string outstr;
89	StringSink ss(outstr);	89	StringSink ss(outstr);
90	self->k->DEREncode(ss);	90	self->k->GetMaterial().Save(ss);
91	PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));	91	PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
92	if (!result)	92	if (!result)
93	return NULL;	93	return NULL;
Lines 216-222 Link Here
216	SigningKey_serialize(SigningKey self, PyObject dummy) {	216	SigningKey_serialize(SigningKey self, PyObject dummy) {
217	std::string outstr;	217	std::string outstr;
218	StringSink ss(outstr);	218	StringSink ss(outstr);
219	self->k->DEREncode(ss);	219	self->k->GetMaterial().Save(ss);
220	PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));	220	PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
221	if (!result)	221	if (!result)
222	return NULL;	222	return NULL;

Return to bug 654614