diff options
| author | Albert Astals Cid <aacid@kde.org> | 2016-09-05 16:08:17 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2016-09-05 16:09:09 +0200 |
| commit | a902f5983e6802c9346569fcc599cf5f5042bd8d (patch) | |
| tree | a2b50f3347d22119f332c6f5a6cabc2a39c71cbf | |
| parent | 7c7c35db46c0da51c09783a00484161721ea48ab (diff) | |
initialize XRef::encryptAlgorithm to something
| -rw-r--r-- | poppler/Decrypt.cc | 12 | ||||
| -rw-r--r-- | poppler/Stream.h | 5 | ||||
| -rw-r--r-- | poppler/XRef.cc | 3 |
3 files changed, 16 insertions, 4 deletions
diff --git a/poppler/Decrypt.cc b/poppler/Decrypt.cc index cfc9676f..c8246fab 100644 --- a/poppler/Decrypt.cc +++ b/poppler/Decrypt.cc @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2008 Julien Rebetez <julien@fhtagn.net> -// Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2008, 2010, 2016 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2009 Matthias Franz <matthias@ktug.or.kr> // Copyright (C) 2009 David Benjamin <davidben@mit.edu> // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it> @@ -349,6 +349,8 @@ BaseCryptStream::BaseCryptStream(Stream *strA, Guchar *fileKey, CryptAlgorithm a case cryptAES256: objKeyLength = keyLength; break; + case cryptNone: + break; } charactersRead = 0; @@ -433,6 +435,8 @@ void EncryptStream::reset() { state.aes256.bufIdx = 0; state.aes256.paddingReached = gFalse; break; + case cryptNone: + break; } } @@ -473,6 +477,8 @@ int EncryptStream::lookChar() { c = state.aes256.buf[state.aes256.bufIdx++]; } break; + case cryptNone: + break; } return (nextCharBuff = c); } @@ -513,6 +519,8 @@ void DecryptStream::reset() { } state.aes256.bufIdx = 16; break; + case cryptNone: + break; } } @@ -554,6 +562,8 @@ int DecryptStream::lookChar() { c = state.aes256.buf[state.aes256.bufIdx++]; } break; + case cryptNone: + break; } return (nextCharBuff = c); } diff --git a/poppler/Stream.h b/poppler/Stream.h index 8304b6cc..07b3933a 100644 --- a/poppler/Stream.h +++ b/poppler/Stream.h @@ -15,7 +15,7 @@ // // Copyright (C) 2005 Jeff Muizelaar <jeff@infidigm.net> // Copyright (C) 2008 Julien Rebetez <julien@fhtagn.net> -// Copyright (C) 2008, 2010, 2011 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2008, 2010, 2011, 2016 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org> // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com> // Copyright (C) 2010 Hib Eris <hib@hiberis.nl> @@ -81,7 +81,8 @@ enum StreamColorSpaceMode { enum CryptAlgorithm { cryptRC4, cryptAES, - cryptAES256 + cryptAES256, + cryptNone }; //------------------------------------------------------------------------ diff --git a/poppler/XRef.cc b/poppler/XRef.cc index 75fa52d8..d9e6db55 100644 --- a/poppler/XRef.cc +++ b/poppler/XRef.cc @@ -15,7 +15,7 @@ // // Copyright (C) 2005 Dan Sheridan <dan.sheridan@postman.org.uk> // Copyright (C) 2005 Brad Hards <bradh@frogmouth.net> -// Copyright (C) 2006, 2008, 2010, 2012-2014 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2006, 2008, 2010, 2012-2014, 2016 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org> // Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> // Copyright (C) 2009, 2010 Ilya Gorenbein <igorenbein@finjan.com> @@ -300,6 +300,7 @@ void XRef::init() { rootNum = -1; strOwner = gFalse; xrefReconstructed = gFalse; + encAlgorithm = cryptNone; } XRef::XRef() { |