Mercurial > hg > release > icedtea7-forest-2.0 > jdk
changeset 4446:b49a0af85821
7049173: Replace the software license for ECC native code
Reviewed-by: alanb
line wrap: on
line diff
--- a/src/share/native/sun/security/ec/impl/ec.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ec.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Elliptic Curve Cryptography library. * @@ -37,23 +34,7 @@ * Dr Vipul Gupta <vipul.gupta@sun.com> and * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "mplogic.h" #include "ec.h"
--- a/src/share/native/sun/security/ec/impl/ec.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ec.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Elliptic Curve Cryptography library. * @@ -36,23 +33,7 @@ * Contributor(s): * Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef __ec_h_ #define __ec_h_
--- a/src/share/native/sun/security/ec/impl/ec2.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ec2.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for binary polynomial field curves. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _EC2_H #define _EC2_H
--- a/src/share/native/sun/security/ec/impl/ec2_163.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ec2_163.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for binary polynomial field curves. * @@ -38,23 +35,7 @@ * Stephen Fung <fungstep@hotmail.com>, and * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories. * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ec2.h" #include "mp_gf2m.h"
--- a/src/share/native/sun/security/ec/impl/ec2_193.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ec2_193.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for binary polynomial field curves. * @@ -38,23 +35,7 @@ * Stephen Fung <fungstep@hotmail.com>, and * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories. * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ec2.h" #include "mp_gf2m.h"
--- a/src/share/native/sun/security/ec/impl/ec2_233.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ec2_233.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for binary polynomial field curves. * @@ -38,23 +35,7 @@ * Stephen Fung <fungstep@hotmail.com>, and * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories. * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ec2.h" #include "mp_gf2m.h"
--- a/src/share/native/sun/security/ec/impl/ec2_aff.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ec2_aff.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for binary polynomial field curves. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ec2.h" #include "mplogic.h"
--- a/src/share/native/sun/security/ec/impl/ec2_mont.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ec2_mont.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for binary polynomial field curves. * @@ -38,23 +35,7 @@ * Stephen Fung <fungstep@hotmail.com>, and * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories. * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ec2.h" #include "mplogic.h"
--- a/src/share/native/sun/security/ec/impl/ec_naf.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ec_naf.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library. * @@ -36,23 +33,7 @@ * Contributor(s): * Stephen Fung <fungstep@hotmail.com>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ecl-priv.h"
--- a/src/share/native/sun/security/ec/impl/ecc_impl.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecc_impl.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Netscape security libraries. * @@ -37,23 +34,7 @@ * Dr Vipul Gupta <vipul.gupta@sun.com> and * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _ECC_IMPL_H #define _ECC_IMPL_H
--- a/src/share/native/sun/security/ec/impl/ecdecode.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecdecode.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Elliptic Curve Cryptography library. * @@ -37,23 +34,7 @@ * Dr Vipul Gupta <vipul.gupta@sun.com> and * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include <sys/types.h>
--- a/src/share/native/sun/security/ec/impl/ecl-curve.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecl-curve.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _ECL_CURVE_H #define _ECL_CURVE_H
--- a/src/share/native/sun/security/ec/impl/ecl-exp.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecl-exp.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _ECL_EXP_H #define _ECL_EXP_H
--- a/src/share/native/sun/security/ec/impl/ecl-priv.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecl-priv.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library. * @@ -37,23 +34,7 @@ * Stephen Fung <fungstep@hotmail.com> and * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _ECL_PRIV_H #define _ECL_PRIV_H
--- a/src/share/native/sun/security/ec/impl/ecl.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecl.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "mpi.h" #include "mplogic.h"
--- a/src/share/native/sun/security/ec/impl/ecl.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecl.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _ECL_H #define _ECL_H
--- a/src/share/native/sun/security/ec/impl/ecl_curve.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecl_curve.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ecl.h" #include "ecl-curve.h"
--- a/src/share/native/sun/security/ec/impl/ecl_gf.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecl_gf.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library. * @@ -37,23 +34,7 @@ * Stephen Fung <fungstep@hotmail.com> and * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "mpi.h" #include "mp_gf2m.h"
--- a/src/share/native/sun/security/ec/impl/ecl_mult.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecl_mult.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "mpi.h" #include "mplogic.h"
--- a/src/share/native/sun/security/ec/impl/ecp.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecp.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for prime field curves. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _ECP_H #define _ECP_H
--- a/src/share/native/sun/security/ec/impl/ecp_192.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecp_192.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for prime field curves. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ecp.h" #include "mpi.h"
--- a/src/share/native/sun/security/ec/impl/ecp_224.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecp_224.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for prime field curves. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ecp.h" #include "mpi.h"
--- a/src/share/native/sun/security/ec/impl/ecp_256.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecp_256.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for prime field curves. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca> * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ecp.h" #include "mpi.h"
--- a/src/share/native/sun/security/ec/impl/ecp_384.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecp_384.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for prime field curves. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca> * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ecp.h" #include "mpi.h"
--- a/src/share/native/sun/security/ec/impl/ecp_521.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecp_521.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for prime field curves. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca> * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ecp.h" #include "mpi.h"
--- a/src/share/native/sun/security/ec/impl/ecp_aff.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecp_aff.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for prime field curves. * @@ -41,23 +38,7 @@ * Nils Larsch <nla@trustcenter.de>, and * Lenka Fibikova <fibikova@exp-math.uni-essen.de>, the OpenSSL Project * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ecp.h" #include "mplogic.h"
--- a/src/share/native/sun/security/ec/impl/ecp_jac.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecp_jac.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for prime field curves. * @@ -41,23 +38,7 @@ * Nils Larsch <nla@trustcenter.de>, and * Lenka Fibikova <fibikova@exp-math.uni-essen.de>, the OpenSSL Project * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ecp.h" #include "mplogic.h"
--- a/src/share/native/sun/security/ec/impl/ecp_jm.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecp_jm.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library for prime field curves. * @@ -36,23 +33,7 @@ * Contributor(s): * Stephen Fung <fungstep@hotmail.com>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "ecp.h" #include "ecl-priv.h"
--- a/src/share/native/sun/security/ec/impl/ecp_mont.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/ecp_mont.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the elliptic curve math library. * @@ -36,23 +33,7 @@ * Contributor(s): * Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ /* Uses Montgomery reduction for field arithmetic. See mpi/mpmontg.c for * code implementation. */
--- a/src/share/native/sun/security/ec/impl/logtab.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/logtab.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Netscape security libraries. * @@ -36,23 +33,7 @@ * Contributor(s): * Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _LOGTAB_H #define _LOGTAB_H
--- a/src/share/native/sun/security/ec/impl/mp_gf2m-priv.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/mp_gf2m-priv.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Multi-precision Binary Polynomial Arithmetic Library. * @@ -37,23 +34,7 @@ * Sheueling Chang Shantz <sheueling.chang@sun.com> and * Douglas Stebila <douglas@stebila.ca> of Sun Laboratories. * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _MP_GF2M_PRIV_H_ #define _MP_GF2M_PRIV_H_
--- a/src/share/native/sun/security/ec/impl/mp_gf2m.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/mp_gf2m.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Multi-precision Binary Polynomial Arithmetic Library. * @@ -37,23 +34,7 @@ * Sheueling Chang Shantz <sheueling.chang@sun.com> and * Douglas Stebila <douglas@stebila.ca> of Sun Laboratories. * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include "mp_gf2m.h" #include "mp_gf2m-priv.h"
--- a/src/share/native/sun/security/ec/impl/mp_gf2m.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/mp_gf2m.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Multi-precision Binary Polynomial Arithmetic Library. * @@ -37,23 +34,7 @@ * Sheueling Chang Shantz <sheueling.chang@sun.com> and * Douglas Stebila <douglas@stebila.ca> of Sun Laboratories. * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _MP_GF2M_H_ #define _MP_GF2M_H_
--- a/src/share/native/sun/security/ec/impl/mpi-config.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/mpi-config.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library. * @@ -36,23 +33,7 @@ * Contributor(s): * Netscape Communications Corporation * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _MPI_CONFIG_H #define _MPI_CONFIG_H
--- a/src/share/native/sun/security/ec/impl/mpi-priv.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/mpi-priv.h Mon May 30 16:37:42 2011 +0100 @@ -1,36 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Arbitrary precision integer arithmetic library - * - * NOTE WELL: the content of this header file is NOT part of the "public" - * API for the MPI library, and may change at any time. - * Application programs that use libmpi should NOT include this header file. - * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * This library 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 + * Lesser General Public License for more details. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library. * @@ -42,22 +33,13 @@ * Contributor(s): * Netscape Communications Corporation * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + *********************************************************************** */ + +/* Arbitrary precision integer arithmetic library * - *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. + * NOTE WELL: the content of this header file is NOT part of the "public" + * API for the MPI library, and may change at any time. + * Application programs that use libmpi should NOT include this header file. */ #ifndef _MPI_PRIV_H
--- a/src/share/native/sun/security/ec/impl/mpi.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/mpi.c Mon May 30 16:37:42 2011 +0100 @@ -1,33 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * - * Arbitrary precision integer arithmetic library - * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library. * @@ -40,25 +34,9 @@ * Netscape Communications Corporation * Douglas Stebila <douglas@stebila.ca> of Sun Laboratories. * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ - -/* $Id: mpi.c,v 1.45 2006/09/29 20:12:21 alexei.volkov.bugs%sun.com Exp $ */ + +/* Arbitrary precision integer arithmetic library */ #include "mpi-priv.h" #if defined(OSF1)
--- a/src/share/native/sun/security/ec/impl/mpi.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/mpi.h Mon May 30 16:37:42 2011 +0100 @@ -1,33 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * - * Arbitrary precision integer arithmetic library - * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library. * @@ -39,23 +33,9 @@ * Contributor(s): * Netscape Communications Corporation * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ + +/* Arbitrary precision integer arithmetic library */ #ifndef _MPI_H #define _MPI_H
--- a/src/share/native/sun/security/ec/impl/mplogic.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/mplogic.c Mon May 30 16:37:42 2011 +0100 @@ -1,33 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * - * Bitwise logical operations on MPI values - * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library. * @@ -38,25 +32,9 @@ * * Contributor(s): * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ -/* $Id: mplogic.c,v 1.15 2004/04/27 23:04:36 gerv%gerv.net Exp $ */ +/* Bitwise logical operations on MPI values */ #include "mpi-priv.h" #include "mplogic.h"
--- a/src/share/native/sun/security/ec/impl/mplogic.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/mplogic.h Mon May 30 16:37:42 2011 +0100 @@ -1,33 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * - * Bitwise logical operations on MPI values - * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library. * @@ -38,23 +32,9 @@ * * Contributor(s): * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ + +/* Bitwise logical operations on MPI values */ #ifndef _MPLOGIC_H #define _MPLOGIC_H
--- a/src/share/native/sun/security/ec/impl/mpmontg.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/mpmontg.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Netscape security libraries. * @@ -38,25 +35,7 @@ * Stephen Fung <stephen.fung@sun.com>, and * Douglas Stebila <douglas@stebila.ca> of Sun Laboratories. * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ - -/* $Id: mpmontg.c,v 1.20 2006/08/29 02:41:38 nelson%bolyard.com Exp $ */ /* This file implements moduluar exponentiation using Montgomery's * method for modular reduction. This file implements the method
--- a/src/share/native/sun/security/ec/impl/mpprime.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/mpprime.h Mon May 30 16:37:42 2011 +0100 @@ -1,34 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * - * Utilities for finding and working with prime and pseudo-prime - * integers - * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * This library 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 + * Lesser General Public License for more details. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library. * @@ -39,23 +32,9 @@ * * Contributor(s): * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ + +/* Utilities for finding and working with prime and pseudo-prime integers */ #ifndef _MP_PRIME_H #define _MP_PRIME_H
--- a/src/share/native/sun/security/ec/impl/oid.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/oid.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Netscape security libraries. * @@ -36,23 +33,7 @@ * Contributor(s): * Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #include <sys/types.h>
--- a/src/share/native/sun/security/ec/impl/secitem.c Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/secitem.c Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Netscape security libraries. * @@ -35,23 +32,7 @@ * * Contributor(s): * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ /* * Support routines for SECItem data structure.
--- a/src/share/native/sun/security/ec/impl/secoidt.h Fri May 27 15:02:22 2011 -0700 +++ b/src/share/native/sun/security/ec/impl/secoidt.h Mon May 30 16:37:42 2011 +0100 @@ -1,30 +1,27 @@ -/* ********************************************************************* +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Sun elects to have this file available under and governed by the - * Mozilla Public License Version 1.1 ("MPL") (see - * http://www.mozilla.org/MPL/ for full license text). For the avoidance - * of doubt and subject to the following, Sun also elects to allow - * licensees to use this file under the MPL, the GNU General Public - * License version 2 only or the Lesser General Public License version - * 2.1 only. Any references to the "GNU General Public License version 2 - * or later" or "GPL" in the following shall be construed to mean the - * GNU General Public License version 2 only. Any references to the "GNU - * Lesser General Public License version 2.1 or later" or "LGPL" in the - * following shall be construed to mean the GNU Lesser General Public - * License version 2.1 only. However, the following notice accompanied - * the original version of this file: + * This library 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 + * Lesser General Public License for more details. * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* ********************************************************************* * * The Original Code is the Netscape security libraries. * @@ -36,23 +33,7 @@ * Contributor(s): * Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * *********************************************************************** */ -/* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ #ifndef _SECOIDT_H_ #define _SECOIDT_H_