Add ability to drop overly large packets

[onak.git] / merge.c

diff --git a/merge.c b/merge.c
index 353a844e6de9a1d346e7f102d7872b4378206137..305c60a740aab0819370b428a05fa7d2364e3162 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -13,22 +13,21 @@
  * 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/>.
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "decodekey.h"
-#include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
-#include "log.h"
 #include "mem.h"
 #include "merge.h"
+#include "onak.h"
 
 /**
  *     compare_packets - Check to see if 2 OpenPGP packets are the same.
@@ -210,7 +209,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
        struct openpgp_packet_list      *curpacket = NULL;
        struct openpgp_packet_list      *nextpacket = NULL;
 
-       log_assert(compare_packets(old->packet, new->packet) == 0);
+       assert(compare_packets(old->packet, new->packet) == 0);
 
        curpacket = new->sigs;
        while (curpacket != NULL) {
@@ -230,7 +229,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
                        if (lastpacket != NULL) {
                                lastpacket->next = curpacket->next;
                        } else {
-                               log_assert(curpacket == new->sigs);
+                               assert(curpacket == new->sigs);
                                new->sigs = curpacket->next;
                        }
                        curpacket->next = NULL;
@@ -362,7 +361,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
                                if (lastpacket != NULL) {
                                        lastpacket->next = curpacket->next;
                                } else {
-                                       log_assert(curpacket == b->sigs);
+                                       assert(curpacket == b->sigs);
                                        b->sigs = curpacket->next;
                                }
                                curpacket->next = NULL;