Add ability to drop overly large packets

[onak.git] / decodekey.h

diff --git a/decodekey.h b/decodekey.h
index 8cd5480027fa39ba21ab2aa6bf9ce79e65391c21..24d5eced19c9bb457204ce92f9d1182d415af53e 100644 (file)
--- a/decodekey.h
+++ b/decodekey.h
@@ -13,8 +13,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef __DECODEKEY_H__
@@ -24,6 +23,7 @@
 #include <time.h>
 #include "keystructs.h"
 #include "ll.h"
+#include "onak.h"
 
 /**
  *     keysigs - Return the sigs on a given OpenPGP signature packet list.
@@ -46,7 +46,8 @@ struct ll *keysigs(struct ll *curll,
  *     key or pulls the data directly from v2/3. NULL can be passed for any
  *     values which aren't cared about.
  */
-void sig_info(struct openpgp_packet *packet, uint64_t *keyid, time_t *creation);
+onak_status_t sig_info(struct openpgp_packet *packet, uint64_t *keyid,
+               time_t *creation);
 
 /**
  *     sig_keyid - Return the keyid for a given OpenPGP signature packet.
@@ -68,17 +69,19 @@ uint64_t sig_keyid(struct openpgp_packet *packet);
 char **keyuids(struct openpgp_publickey *key, char **primary);
 
 /**
- *     keysubkeys - Takes a key and returns an array of its subkey keyids.
+ *     keysubkeys - Takes a key & returns an array of its subkey fingerprints
  *     @key: The key to get the subkeys of.
  *
  *     keysubkeys takes a public key structure and returns an array of the
- *     subkey keyids for that key.
+ *     subkey fingerprints for that key.
  */
-uint64_t *keysubkeys(struct openpgp_publickey *key);
+struct openpgp_fingerprint *keysubkeys(struct openpgp_publickey *key);
 
 /**
  *     parse_subpackets - Parse the subpackets of a Type 4 signature.
  *     @data: The subpacket data.
+ *     @len: The amount of data available to read.
+ *     @parselen: The amount of data that was actually parsed.
  *     @keyid: A pointer to where we should return the keyid.
  *     @creationtime: A pointer to where we should return the creation time.
  *
@@ -87,6 +90,7 @@ uint64_t *keysubkeys(struct openpgp_publickey *key);
  *     processed. If the value of any piece of data is not desired a NULL
  *     can be passed instead of a pointer to a storage area for that value.
  */
-int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation);
+onak_status_t parse_subpackets(unsigned char *data, size_t len,
+               size_t *parselen, uint64_t *keyid, time_t *creation);
 
 #endif