summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-01-28 14:21:21 +0000
committerMatt Caswell <matt@openssl.org>2016-01-28 17:06:38 +0000
commit09ccb58518e84f76939f7e69929723263a42ca2e (patch)
tree9016f3b73663bff7a1f8d7ef861297467ad5c16f
parent6210c70992011d6f4c52b63b0a1da3c3471ba5b0 (diff)
Prepare for 1.0.1r releaseOpenSSL_1_0_1r
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--CHANGES2
-rw-r--r--NEWS2
-rw-r--r--README2
-rw-r--r--crypto/opensslv.h6
4 files changed, 6 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index 24cf821257..b84ff94e3e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
OpenSSL CHANGES
_______________
- Changes between 1.0.1q and 1.0.1r [xx XXX xxxx]
+ Changes between 1.0.1q and 1.0.1r [28 Jan 2016]
*) Protection for DH small subgroup attacks
diff --git a/NEWS b/NEWS
index d8e4fd0173..c8193d582c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@
This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file.
- Major changes between OpenSSL 1.0.1q and OpenSSL 1.0.1r [under development]
+ Major changes between OpenSSL 1.0.1q and OpenSSL 1.0.1r [28 Jan 2016]
o Protection for DH small subgroup attacks
o SSLv2 doesn't block disabled ciphers (CVE-2015-3197)
diff --git a/README b/README
index 13d7b2ce1d..5e914f8101 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.1r-dev
+ OpenSSL 1.0.1r 28 Jan 2016
Copyright (c) 1998-2015 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 0bb1bc150f..3af71c493f 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-# define OPENSSL_VERSION_NUMBER 0x10001120L
+# define OPENSSL_VERSION_NUMBER 0x1000112fL
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1r-fips-dev xx XXX xxxx"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1r-fips 28 Jan 2016"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1r-dev xx XXX xxxx"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1r 28 Jan 2016"
# endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
r: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
<?php $TRANSLATIONS = array(
"Error changing name of folder " => "Error en canviar el nom de la carpeta",
"Error collapsing folder." => "Error en col·lapsar la carpeta.",
"Feed already exists." => "La font ja existeix",
"Error adding feed." => "Error en afegir la font",
"Feed added!" => "S'ha afegit la font!",
"Error adding folder." => "Error en afegir la carpeta.",
"Folder added!" => "S'ha afegit la carpeta",
"Error removing feed." => "Error en eliminar la font.",
"Error removing folder." => "Error en eliminar la carpeta.",
"Error updating feeds." => "Error en actualitzar les fonts.",
"An error occurred while parsing the file." => "S'ha produït un error en processar el fitxer.",
"Feed loaded!" => "S'ha carregat la font!",
"Error moving feed into folder." => "Error en moure la font dins la carpeta.",
"No file path was submitted." => "No heu enviat cap camí al fitxer",
"File doesn't exist:" => "El fitxer no existeix:",
"Error setting all items as read." => "Error en establir tots els elements com a llegits.",
"Error marking item as read." => "Error en marcar l'element com a llegit.",
"Error updating feed." => "rror en actualitzar la font.",
"Feed updated!" => "La font s'ha actualitzat!",
"News" => "Notícies",
"Error while loading the feed" => "Error al carregar la font de dades",
"Error" => "Error",
"None" => "cap",
"Show only unread" => "Mostra només els no llegits",
"Show everything" => "Mostra-ho tot",
"Are you sure you want to delete this feed?" => "Segur que voleu eliminar aquesta font?",
"Are you sure you want to delete this folder and all its feeds?" => "Segur que voleu eliminar aquesta carpeta i totes les seves fonts?",
"Warning" => "Avís",
"Name of the folder cannot be empty." => "El nom de la carpeta no por ser buit",
"Adding..." => "Afegint...",
"Add folder" => "Afegeix carpeta",
"Changing..." => "S'està canviant",
"Change folder name" => "Canvia el nom de la carpeta",
"URL cannot be empty." => "La URL no pot ser buida",
"Add feed" => "Afegeix font",
"Error while parsing the feed" => "Error en processar la font",
"Fatal Error" => "Error fatal",
"No files selected." => "No hi ha fitxers seleccionats",
" out of " => "d'un total de",
" feeds imported successfully from " => "fonts importades correctament des de",
"Success" => "Èxit",
"Select file" => "Selecciona fitxer",
"no title" => "sense títol",
"no name" => "sense nom",
"no body" => "sense cos",
"subscriptions in ownCloud - News" => "subscripcions a ownCloud - Notícies",
"An error occurred" => "S'ha produït un error",
"Nice! You have subscribed to " => "Bé! Us heu subscrit a",
"You had already subcribed to this feed!" => "Ja us havíeu subscrit a aquesta font",
"You don't have any feed in your reader." => "No teniu cap font al vostre lector.",
"Address" => "Adreça",
"Subscribe" => "Subscriu",
"Import OPML" => "Importa OPML",
"Upload file from desktop" => "Puja fitxer des de l'escriptori",
"Upload" => "Puja",
"Select file from ownCloud" => "Selecciona un fitxer des de ownCloud",
"Select" => "Selecciona",
"Select file from <a href=\"#\" class=\"settings\" id=\"browselink\">local filesystem</a> or <a href=\"#\" class=\"settings\" id=\"cloudlink\">cloud</a>" => "Seleccioneu un fitxer del <a href=\"#\" class=\"settings\" id=\"browselink\">sistema de fitxers local</a> o <a href=\"#\" class=\"settings\" id=\"cloudlink\">del núvol</a>",
"Import" => "Importa",
"Or..." => "o...",
"Add feed or folder" => "Afegeix font o carpeta",
"Add Feed/Folder" => "Afegeix font/carpeta",
"Feed" => "Font",
"Folder" => "Carpeta",
"Settings" => "Configuració",
"Add Folder" => "Afegeix una carpeta",
"Add new folder" => "Afegeix una carpeta nova",
"Folder name" => "Nom de la carpeta",
"Add Subscription" => "Afegeix subscripció",
"Add new feed" => "Afegeix una font nova",
"Choose folder" => "Escull una carpeta",
"Add" => "Afegeix",
"New articles" => "Articles nous",
"Mark all read" => "Marca-ho tot com a llegit",
"Starred" => "Estrelles",
"Mark as unimportant" => "Marca com a no important",
"Mark as important" => "Marca com a important",
"from" => "des de",
"by" => "per",
"Share" => "Comparteix",
"Keep unread" => "Mantén com a sense llegir",
"Delete feed" => "Elimina font",
"Collapse" => "Col·lapsa",
"Delete folder" => "Elimina carpeta",
"Rename folder" => "Reanomena carpeta",
"Import feeds" => "Importa fonts",
"Export feeds" => "Exporta fonts",
"Download OPML" => "Baixa OPML",
"Subscribelet" => "Subscripció",
"Drag this to your browser bookmarks and click on it whenever you want to subscribe to a webpage quickly:" => "Arrossegueu això a les adreces d'interès del vostre navegador i feu-hi clic quan vulgueu subscriure-us ràpidament en una pàgina web:"
);