X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_ssl.c;h=5196e48ed07a53836b39decf96ad6797a15a55ba;hp=317728c1adc786faf33a7a38fdb64b48fad4d5f5;hb=7ea0c50703a93a8fb4f0dd05fc4e023cfc9ffd36;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281 diff --git a/mutt_ssl.c b/mutt_ssl.c index 317728c..5196e48 100644 --- a/mutt_ssl.c +++ b/mutt_ssl.c @@ -1,19 +1,10 @@ /* + * Copyright notice from original mutt: * Copyright (C) 1999-2001 Tommi Komulainen - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. */ #if HAVE_CONFIG_H @@ -35,6 +26,10 @@ #include "mutt_curses.h" #include "mutt_ssl.h" +#include "lib/mem.h" +#include "lib/intl.h" +#include "lib/str.h" + #if OPENSSL_VERSION_NUMBER >= 0x00904000L #define READ_X509_KEY(fp, key) PEM_read_X509(fp, key, NULL, NULL) #else @@ -378,7 +373,7 @@ static char *x509_get_part (char *line, const char *ndx) c = strstr (line, ndx); if (c) { - c += strlen (ndx); + c += safe_strlen (ndx); c2 = strchr (c, '/'); if (c2) *c2 = '\0';