[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2105: add crypt_r and friends (bug 3764)

Mats Wichmann mats at linuxfoundation.org
Wed Mar 20 19:24:24 UTC 2013


------------------------------------------------------------
revno: 2105
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2013-03-20 13:24:24 -0600
message:
  add crypt_r and friends (bug 3764)
modified:
  headers/All/5.0/crypt.h.defs
  headers/IA32/5.0/crypt.h.defs
  headers/IA64/5.0/crypt.h.defs
  headers/PPC32/5.0/crypt.h.defs
  headers/PPC64/5.0/crypt.h.defs
  headers/S390/5.0/crypt.h.defs
  headers/S390X/5.0/crypt.h.defs
  headers/crypt.h
  headers/x86-64/5.0/crypt.h.defs
  package/Makefile
  stub_libs/5.0/IA32/libcrypt.Version
  stub_libs/5.0/IA32/libcrypt.c
  stub_libs/5.0/IA64/libcrypt.Version
  stub_libs/5.0/IA64/libcrypt.c
  stub_libs/5.0/PPC32/libcrypt.Version
  stub_libs/5.0/PPC32/libcrypt.c
  stub_libs/5.0/PPC64/libcrypt.Version
  stub_libs/5.0/PPC64/libcrypt.c
  stub_libs/5.0/S390/libcrypt.Version
  stub_libs/5.0/S390/libcrypt.c
  stub_libs/5.0/S390X/libcrypt.Version
  stub_libs/5.0/S390X/libcrypt.c
  stub_libs/5.0/x86-64/libcrypt.Version
  stub_libs/5.0/x86-64/libcrypt.c
-------------- next part --------------
=== modified file 'headers/All/5.0/crypt.h.defs'
--- a/headers/All/5.0/crypt.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/All/5.0/crypt.h.defs	2013-03-20 19:24:24 +0000
@@ -0,0 +1,18 @@
+
+struct crypt_data {
+    char keysched[128];
+    char sb0[32768];
+    char sb1[32768];
+    char sb2[32768];
+    char sb3[32768];
+    char crypt_3_buf[14];
+    char current_salt[2];
+    long int current_saltbits;
+    int direction;
+    int initialized;
+};
+extern char *crypt_r(const char *key, const char *salt,
+		     struct crypt_data *data);
+extern void encrypt_r(const char *block, int edflag,
+		      struct crypt_data *data);
+extern void setkey_r(const char *key, struct crypt_data *data);

=== modified file 'headers/IA32/5.0/crypt.h.defs'
--- a/headers/IA32/5.0/crypt.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/IA32/5.0/crypt.h.defs	2013-03-20 19:24:24 +0000
@@ -0,0 +1,5 @@
+
+/*
+ * This header is architecture neutral
+ * Please refer to the generic specification for details
+ */

=== modified file 'headers/IA64/5.0/crypt.h.defs'
--- a/headers/IA64/5.0/crypt.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/IA64/5.0/crypt.h.defs	2013-03-20 19:24:24 +0000
@@ -0,0 +1,5 @@
+
+/*
+ * This header is architecture neutral
+ * Please refer to the generic specification for details
+ */

=== modified file 'headers/PPC32/5.0/crypt.h.defs'
--- a/headers/PPC32/5.0/crypt.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/PPC32/5.0/crypt.h.defs	2013-03-20 19:24:24 +0000
@@ -0,0 +1,5 @@
+
+/*
+ * This header is architecture neutral
+ * Please refer to the generic specification for details
+ */

=== modified file 'headers/PPC64/5.0/crypt.h.defs'
--- a/headers/PPC64/5.0/crypt.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/PPC64/5.0/crypt.h.defs	2013-03-20 19:24:24 +0000
@@ -0,0 +1,5 @@
+
+/*
+ * This header is architecture neutral
+ * Please refer to the generic specification for details
+ */

=== modified file 'headers/S390/5.0/crypt.h.defs'
--- a/headers/S390/5.0/crypt.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/S390/5.0/crypt.h.defs	2013-03-20 19:24:24 +0000
@@ -0,0 +1,5 @@
+
+/*
+ * This header is architecture neutral
+ * Please refer to the generic specification for details
+ */

=== modified file 'headers/S390X/5.0/crypt.h.defs'
--- a/headers/S390X/5.0/crypt.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/S390X/5.0/crypt.h.defs	2013-03-20 19:24:24 +0000
@@ -0,0 +1,5 @@
+
+/*
+ * This header is architecture neutral
+ * Please refer to the generic specification for details
+ */

=== modified file 'headers/crypt.h'
--- a/headers/crypt.h	2008-04-22 23:49:28 +0000
+++ b/headers/crypt.h	2013-03-20 19:24:24 +0000
@@ -8,6 +8,33 @@
 #endif
 
 
+#if __LSB_VERSION__ >= 50
+    struct crypt_data {
+	char keysched[128];
+	char sb0[32768];
+	char sb1[32768];
+	char sb2[32768];
+	char sb3[32768];
+	char crypt_3_buf[14];
+	char current_salt[2];
+	long int current_saltbits;
+	int direction;
+	int initialized;
+    };
+
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
+
+/* Function prototypes */
+
+#if __LSB_VERSION__ >= 50
+    extern char *crypt_r(const char *key, const char *salt,
+			 struct crypt_data *data);
+    extern void encrypt_r(const char *block, int edflag,
+			  struct crypt_data *data);
+    extern void setkey_r(const char *key, struct crypt_data *data);
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'headers/x86-64/5.0/crypt.h.defs'
--- a/headers/x86-64/5.0/crypt.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/x86-64/5.0/crypt.h.defs	2013-03-20 19:24:24 +0000
@@ -0,0 +1,5 @@
+
+/*
+ * This header is architecture neutral
+ * Please refer to the generic specification for details
+ */

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-03-18 15:25:06 +0000
+++ b/package/Makefile	2013-03-20 19:24:24 +0000
@@ -42,11 +42,11 @@
 # Should have leading "."
 # a big number (80-99) is leading up to the next minor spec
 # build_env is version-independent so can wait till late to bump this
-SUB_VERSION=.32
+SUB_VERSION=.33
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=4
+RPM_PACKAGE_RELEASE=1
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)

=== modified file 'stub_libs/5.0/IA32/libcrypt.Version'
--- a/stub_libs/5.0/IA32/libcrypt.Version	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/IA32/libcrypt.Version	2013-03-20 19:24:24 +0000
@@ -1,6 +1,9 @@
 LSB_DUMMY { __LSB_DUMMY; };
 GLIBC_2.0 {
   crypt;
+  crypt_r;
   encrypt;
+  encrypt_r;
   setkey;
+  setkey_r;
 };

=== modified file 'stub_libs/5.0/IA32/libcrypt.c'
--- a/stub_libs/5.0/IA32/libcrypt.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/IA32/libcrypt.c	2013-03-20 19:24:24 +0000
@@ -1,3 +1,6 @@
 void crypt() {} ;
+void crypt_r() {} ;
 void encrypt() {} ;
+void encrypt_r() {} ;
 void setkey() {} ;
+void setkey_r() {} ;

=== modified file 'stub_libs/5.0/IA64/libcrypt.Version'
--- a/stub_libs/5.0/IA64/libcrypt.Version	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/IA64/libcrypt.Version	2013-03-20 19:24:24 +0000
@@ -1,6 +1,9 @@
 LSB_DUMMY { __LSB_DUMMY; };
 GLIBC_2.0 {
   crypt;
+  crypt_r;
   encrypt;
+  encrypt_r;
   setkey;
+  setkey_r;
 };

=== modified file 'stub_libs/5.0/IA64/libcrypt.c'
--- a/stub_libs/5.0/IA64/libcrypt.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/IA64/libcrypt.c	2013-03-20 19:24:24 +0000
@@ -1,3 +1,6 @@
 void crypt() {} ;
+void crypt_r() {} ;
 void encrypt() {} ;
+void encrypt_r() {} ;
 void setkey() {} ;
+void setkey_r() {} ;

=== modified file 'stub_libs/5.0/PPC32/libcrypt.Version'
--- a/stub_libs/5.0/PPC32/libcrypt.Version	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/PPC32/libcrypt.Version	2013-03-20 19:24:24 +0000
@@ -1,6 +1,9 @@
 LSB_DUMMY { __LSB_DUMMY; };
 GLIBC_2.0 {
   crypt;
+  crypt_r;
   encrypt;
+  encrypt_r;
   setkey;
+  setkey_r;
 };

=== modified file 'stub_libs/5.0/PPC32/libcrypt.c'
--- a/stub_libs/5.0/PPC32/libcrypt.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/PPC32/libcrypt.c	2013-03-20 19:24:24 +0000
@@ -1,3 +1,6 @@
 void crypt() {} ;
+void crypt_r() {} ;
 void encrypt() {} ;
+void encrypt_r() {} ;
 void setkey() {} ;
+void setkey_r() {} ;

=== modified file 'stub_libs/5.0/PPC64/libcrypt.Version'
--- a/stub_libs/5.0/PPC64/libcrypt.Version	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/PPC64/libcrypt.Version	2013-03-20 19:24:24 +0000
@@ -1,6 +1,9 @@
 LSB_DUMMY { __LSB_DUMMY; };
 GLIBC_2.3 {
   crypt;
+  crypt_r;
   encrypt;
+  encrypt_r;
   setkey;
+  setkey_r;
 };

=== modified file 'stub_libs/5.0/PPC64/libcrypt.c'
--- a/stub_libs/5.0/PPC64/libcrypt.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/PPC64/libcrypt.c	2013-03-20 19:24:24 +0000
@@ -1,3 +1,6 @@
 void crypt() {} ;
+void crypt_r() {} ;
 void encrypt() {} ;
+void encrypt_r() {} ;
 void setkey() {} ;
+void setkey_r() {} ;

=== modified file 'stub_libs/5.0/S390/libcrypt.Version'
--- a/stub_libs/5.0/S390/libcrypt.Version	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/S390/libcrypt.Version	2013-03-20 19:24:24 +0000
@@ -1,6 +1,9 @@
 LSB_DUMMY { __LSB_DUMMY; };
 GLIBC_2.0 {
   crypt;
+  crypt_r;
   encrypt;
+  encrypt_r;
   setkey;
+  setkey_r;
 };

=== modified file 'stub_libs/5.0/S390/libcrypt.c'
--- a/stub_libs/5.0/S390/libcrypt.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/S390/libcrypt.c	2013-03-20 19:24:24 +0000
@@ -1,3 +1,6 @@
 void crypt() {} ;
+void crypt_r() {} ;
 void encrypt() {} ;
+void encrypt_r() {} ;
 void setkey() {} ;
+void setkey_r() {} ;

=== modified file 'stub_libs/5.0/S390X/libcrypt.Version'
--- a/stub_libs/5.0/S390X/libcrypt.Version	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/S390X/libcrypt.Version	2013-03-20 19:24:24 +0000
@@ -1,6 +1,9 @@
 LSB_DUMMY { __LSB_DUMMY; };
 GLIBC_2.2 {
   crypt;
+  crypt_r;
   encrypt;
+  encrypt_r;
   setkey;
+  setkey_r;
 };

=== modified file 'stub_libs/5.0/S390X/libcrypt.c'
--- a/stub_libs/5.0/S390X/libcrypt.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/S390X/libcrypt.c	2013-03-20 19:24:24 +0000
@@ -1,3 +1,6 @@
 void crypt() {} ;
+void crypt_r() {} ;
 void encrypt() {} ;
+void encrypt_r() {} ;
 void setkey() {} ;
+void setkey_r() {} ;

=== modified file 'stub_libs/5.0/x86-64/libcrypt.Version'
--- a/stub_libs/5.0/x86-64/libcrypt.Version	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/x86-64/libcrypt.Version	2013-03-20 19:24:24 +0000
@@ -1,6 +1,9 @@
 LSB_DUMMY { __LSB_DUMMY; };
 GLIBC_2.2.5 {
   crypt;
+  crypt_r;
   encrypt;
+  encrypt_r;
   setkey;
+  setkey_r;
 };

=== modified file 'stub_libs/5.0/x86-64/libcrypt.c'
--- a/stub_libs/5.0/x86-64/libcrypt.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/x86-64/libcrypt.c	2013-03-20 19:24:24 +0000
@@ -1,3 +1,6 @@
 void crypt() {} ;
+void crypt_r() {} ;
 void encrypt() {} ;
+void encrypt_r() {} ;
 void setkey() {} ;
+void setkey_r() {} ;



More information about the lsb-messages mailing list