summaryrefslogtreecommitdiffstats
path: root/src/lib/crypto/openssl
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2011-03-09 21:46:07 +0000
committerGreg Hudson <ghudson@mit.edu>2011-03-09 21:46:07 +0000
commit7da53e2942176c5ddfe007ba0a36f449e9fdb9fb (patch)
tree4881536c48fdeb215e0cbaea18263365330ad9b0 /src/lib/crypto/openssl
parentfe012b454a193c1f81ab8011ecd620750e5869f0 (diff)
downloadkrb5-7da53e2942176c5ddfe007ba0a36f449e9fdb9fb.tar.gz
krb5-7da53e2942176c5ddfe007ba0a36f449e9fdb9fb.tar.xz
krb5-7da53e2942176c5ddfe007ba0a36f449e9fdb9fb.zip
Adjust most C source files to match the new standards for copyright
and license comments. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24695 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/openssl')
-rw-r--r--src/lib/crypto/openssl/des/des_oldapis.c4
-rw-r--r--src/lib/crypto/openssl/des/f_parity.c3
-rw-r--r--src/lib/crypto/openssl/des/string2key.c3
-rw-r--r--src/lib/crypto/openssl/enc_provider/aes.c3
-rw-r--r--src/lib/crypto/openssl/enc_provider/camellia.c3
-rw-r--r--src/lib/crypto/openssl/enc_provider/des.c4
-rw-r--r--src/lib/crypto/openssl/enc_provider/des3.c4
-rw-r--r--src/lib/crypto/openssl/enc_provider/rc4.c9
-rw-r--r--src/lib/crypto/openssl/hash_provider/hash_sha1.c4
-rw-r--r--src/lib/crypto/openssl/hmac.c4
-rw-r--r--src/lib/crypto/openssl/init.c6
-rw-r--r--src/lib/crypto/openssl/pbkdf2.c7
12 files changed, 18 insertions, 36 deletions
diff --git a/src/lib/crypto/openssl/des/des_oldapis.c b/src/lib/crypto/openssl/des/des_oldapis.c
index 79163c40c7..584140f2cb 100644
--- a/src/lib/crypto/openssl/des/des_oldapis.c
+++ b/src/lib/crypto/openssl/des/des_oldapis.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/openssl/des/des_oldapis.c */
/*
- * lib/crypto/openssl/des/des_oldapis.c
- *
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,7 +22,6 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
*/
#include "crypto_int.h"
diff --git a/src/lib/crypto/openssl/des/f_parity.c b/src/lib/crypto/openssl/des/f_parity.c
index 1fb3f6eb82..f5744726ab 100644
--- a/src/lib/crypto/openssl/des/f_parity.c
+++ b/src/lib/crypto/openssl/des/f_parity.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/openssl/des/f_parity.c */
/*
- * lib/crypto/openssl/des/f_parity.c
- *
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
diff --git a/src/lib/crypto/openssl/des/string2key.c b/src/lib/crypto/openssl/des/string2key.c
index 923cee52b5..cd3e75935d 100644
--- a/src/lib/crypto/openssl/des/string2key.c
+++ b/src/lib/crypto/openssl/des/string2key.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/openssl/des/string2key.c */
/*
- * lib/crypto/openssl/des/string2key.c
- *
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
diff --git a/src/lib/crypto/openssl/enc_provider/aes.c b/src/lib/crypto/openssl/enc_provider/aes.c
index 1b16c0ca4a..ced93f7426 100644
--- a/src/lib/crypto/openssl/enc_provider/aes.c
+++ b/src/lib/crypto/openssl/enc_provider/aes.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/openssl/enc_provider/aes.c */
/*
- * lib/crypto/openssl/enc_provider/aes.c
- *
* Copyright (C) 2003, 2007, 2008, 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
diff --git a/src/lib/crypto/openssl/enc_provider/camellia.c b/src/lib/crypto/openssl/enc_provider/camellia.c
index ab7370feb8..a7175e3282 100644
--- a/src/lib/crypto/openssl/enc_provider/camellia.c
+++ b/src/lib/crypto/openssl/enc_provider/camellia.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/openssl/enc_provider/camellia.c */
/*
- * lib/crypto/openssl/enc_provider/camellia.c
- *
* Copyright (C) 2003, 2007, 2008, 2009, 2010 by the Massachusetts Institute of
* Technology. All rights reserved.
*
diff --git a/src/lib/crypto/openssl/enc_provider/des.c b/src/lib/crypto/openssl/enc_provider/des.c
index 151b6ddfb2..591e13b804 100644
--- a/src/lib/crypto/openssl/enc_provider/des.c
+++ b/src/lib/crypto/openssl/enc_provider/des.c
@@ -1,6 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* lib/crypto/openssl/enc_provider/des.c
- *
+/* lib/crypto/openssl/enc_provider/des.c */
+/*
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
diff --git a/src/lib/crypto/openssl/enc_provider/des3.c b/src/lib/crypto/openssl/enc_provider/des3.c
index fe41ef7727..ca843f9f5e 100644
--- a/src/lib/crypto/openssl/enc_provider/des3.c
+++ b/src/lib/crypto/openssl/enc_provider/des3.c
@@ -1,6 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* lib/crypto/openssl/enc_provider/des3.c
- *
+/* lib/crypto/openssl/enc_provider/des3.c */
+/*
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
diff --git a/src/lib/crypto/openssl/enc_provider/rc4.c b/src/lib/crypto/openssl/enc_provider/rc4.c
index 2ae4a84f19..a8db754591 100644
--- a/src/lib/crypto/openssl/enc_provider/rc4.c
+++ b/src/lib/crypto/openssl/enc_provider/rc4.c
@@ -1,8 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* lib/crypto/openssl/enc_provider/rc4.c
- *
- * #include STD_DISCLAIMER
- *
+/* lib/crypto/openssl/enc_provider/rc4.c */
+/*
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -26,8 +24,7 @@
* or implied warranty.
*/
-/* arcfour.c
- *
+/*
* Copyright (c) 2000 by Computer Science Laboratory,
* Rensselaer Polytechnic Institute
*
diff --git a/src/lib/crypto/openssl/hash_provider/hash_sha1.c b/src/lib/crypto/openssl/hash_provider/hash_sha1.c
index f6f1a65696..cdfed55f3e 100644
--- a/src/lib/crypto/openssl/hash_provider/hash_sha1.c
+++ b/src/lib/crypto/openssl/hash_provider/hash_sha1.c
@@ -1,6 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* lib/crypto/openssl/hash/yhash.h
- *
+/* lib/crypto/openssl/hash_provider/hash_sha1.c */
+/*
* Copyright (C) 1998 by the FundsXpress, INC.
*
* All rights reserved.
diff --git a/src/lib/crypto/openssl/hmac.c b/src/lib/crypto/openssl/hmac.c
index ac5af3fc0b..f92ce8b5c2 100644
--- a/src/lib/crypto/openssl/hmac.c
+++ b/src/lib/crypto/openssl/hmac.c
@@ -1,6 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* lib/crypto/openssl/hmac.c
- *
+/* lib/crypto/openssl/hmac.c */
+/*
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
diff --git a/src/lib/crypto/openssl/init.c b/src/lib/crypto/openssl/init.c
index b3db6c214d..1139bce533 100644
--- a/src/lib/crypto/openssl/init.c
+++ b/src/lib/crypto/openssl/init.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/openssl/init.c - Module init and cleanup functions */
/*
- * lib/crypto/openssl/init.c
- *
* Copyright (C) 2010 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,9 +22,6 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
- *
- * OpenSSL back-end library init functions
*/
#include "crypto_int.h"
diff --git a/src/lib/crypto/openssl/pbkdf2.c b/src/lib/crypto/openssl/pbkdf2.c
index ba51ad4a0f..2a7da3f897 100644
--- a/src/lib/crypto/openssl/pbkdf2.c
+++ b/src/lib/crypto/openssl/pbkdf2.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/openssl/pbkdf2.c */
/*
- * lib/crypto/openssl/pbkdf2.c
- *
* Copyright 2002, 2008, 2009 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
@@ -23,10 +22,6 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
- *
- * Implementation of PBKDF2 from RFC 2898.
- * Not currently used; likely to be used when we get around to AES support.
*/
#include "crypto_int.h"