X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fgtkdlg.c;h=4eb4b010a4341781b3f4a5fd59bed27e39a3614d;hb=095072fa46b2d7b8beafaddb2f873d2f500a1e10;hp=5f79fc71a69354cfe29dde311080595ddcb8a0af;hpb=21101c7397e460933635a7bfed813864fc4f88fe;p=PuTTY.git

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 5f79fc71..4eb4b010 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -33,6 +33,7 @@
 #include "storage.h"
 #include "dialog.h"
 #include "tree234.h"
+#include "licence.h"
 
 #if GTK_CHECK_VERSION(2,0,0)
 /* Decide which of GtkFileChooserDialog and GtkFileSelection to use */
@@ -3561,6 +3562,37 @@ int askalg(void *frontend, const char *algtype, const char *algname,
     }
 }
 
+int askhk(void *frontend, const char *algname, const char *betteralgs,
+          void (*callback)(void *ctx, int result), void *ctx)
+{
+    static const char msg[] =
+	"The first host key type we have stored for this server\n"
+	"is %s, which is below the configured warning threshold.\n"
+	"The server also provides the following types of host key\n"
+        "above the threshold, which we do not have stored:\n"
+        "%s\n"
+	"Continue with connection?";
+    char *text;
+    int ret;
+
+    text = dupprintf(msg, algname, betteralgs);
+    ret = messagebox(GTK_WIDGET(get_window(frontend)),
+		     "PuTTY Security Alert", text,
+		     string_width("is ecdsa-nistp521, which is"
+                                  " below the configured warning threshold."),
+                     FALSE,
+		     "Yes", 'y', 0, 1,
+		     "No", 'n', 0, 0,
+		     NULL);
+    sfree(text);
+
+    if (ret) {
+	return 1;
+    } else {
+	return 0;
+    }
+}
+
 void old_keyfile_warning(void)
 {
     /*
@@ -3626,39 +3658,9 @@ static void licence_clicked(GtkButton *button, gpointer data)
 {
     char *title;
 
-    const char *licence =
-	"Copyright 1997-2015 Simon Tatham.\n\n"
-
-	"Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
-	"Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas "
-	"Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, "
-	"Markus Kuhn, Colin Watson, Christopher Staite, and CORE SDI S.A.\n\n"
-
-	"Permission is hereby granted, free of charge, to any person "
-	"obtaining a copy of this software and associated documentation "
-	"files (the ""Software""), to deal in the Software without restriction, "
-	"including without limitation the rights to use, copy, modify, merge, "
-	"publish, distribute, sublicense, and/or sell copies of the Software, "
-	"and to permit persons to whom the Software is furnished to do so, "
-	"subject to the following conditions:\n\n"
-
-	"The above copyright notice and this permission notice shall be "
-	"included in all copies or substantial portions of the Software.\n\n"
-
-	"THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT "
-	"WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, "
-	"INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF "
-	"MERCHANTABILITY, FITNESS FOR A PARTICULAR "
-	"PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE "
-	"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES "
-	"OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, "
-	"TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN "
-	"CONNECTION WITH THE SOFTWARE OR THE USE OR "
-	"OTHER DEALINGS IN THE SOFTWARE.";
-
     title = dupcat(appname, " Licence", NULL);
     assert(aboutbox != NULL);
-    messagebox(aboutbox, title, licence,
+    messagebox(aboutbox, title, LICENCE_TEXT("\n\n"),
 	       string_width("LONGISH LINE OF TEXT SO THE LICENCE"
 			    " BOX ISN'T EXCESSIVELY TALL AND THIN"),
                TRUE, "OK", 'o', 1, 1, NULL);
@@ -3699,10 +3701,11 @@ void about_box(void *window)
     gtk_widget_show(w);
 
     {
+        char *buildinfo_text = buildinfo("\n");
         char *label_text = dupprintf
-            ("%s\n\n%s\n\n%s",
-             appname, ver,
-             "Copyright 1997-2015 Simon Tatham. All rights reserved");
+            ("%s\n\n%s\n\n%s\n\n%s",
+             appname, ver, buildinfo_text,
+             "Copyright " SHORT_COPYRIGHT_DETAILS ". All rights reserved");
         w = gtk_label_new(label_text);
         gtk_label_set_justify(GTK_LABEL(w), GTK_JUSTIFY_CENTER);
 #if GTK_CHECK_VERSION(2,0,0)